NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Xapi#CreateVm): wait for the cloned vifs to be correctly deleted (#574)

Browse Source
This commit is contained in:
badrAZ 2017-09-04 15:18:42 +02:00 committed by Julien Fontanet
parent f5febef10f
commit cf5f9d4080
1 changed files with 30 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/xapi/mixins/vm.js
View File

@ -111,7 +111,6 @@ export default {
}
}
let nVbds = vm.VBDs.length
let hasBootableDisk = !!find(vm.$VBDs, 'bootable')
// Inserts the CD if necessary.
@ -122,8 +121,6 @@ export default {
bootable: true
})
hasBootableDisk = true
++nVbds
}
// Modify existing (previous template) disks if necessary
@ -153,56 +150,49 @@ export default {
// TODO: set vm.suspend_SR
if (!isEmpty(vdis)) {
const devices = await this.call('VM.get_allowed_VBD_devices', vm.$ref)
await Promise.all(mapToArray(vdis, (vdiDescription, i) => {
++nVbds
return this._createVdi(
vdiDescription.size, // FIXME: Should not be done in Xapi.
{
name_label: vdiDescription.name_label,
name_description: vdiDescription.name_description,
sr: vdiDescription.sr || vdiDescription.SR
}
)
.then(ref => this._getOrWaitObject(ref))
.then(vdi => this._createVbd(vm, vdi, {
// Either the CD or the 1st disk is bootable (only useful for PV VMs)
bootable: !(hasBootableDisk || i),
userdevice: devices[i]
}))
}))
await Promise.all(mapToArray(vdis, (vdiDescription, i) => this._createVdi(
vdiDescription.size, // FIXME: Should not be done in Xapi.
{
name_label: vdiDescription.name_label,
name_description: vdiDescription.name_description,
sr: vdiDescription.sr || vdiDescription.SR
}
)
.then(ref => this._getOrWaitObject(ref))
.then(vdi => this._createVbd(vm, vdi, {
// Either the CD or the 1st disk is bootable (only useful for PV VMs)
bootable: !(hasBootableDisk || i),
userdevice: devices[i]
}))
))
}
// Destroys the VIFs cloned from the template.
await Promise.all(mapToArray(vm.$VIFs, vif => this._deleteVif(vif)))
// Creates the VIFs specified by the user.
let nVifs = 0
if (vifs) {
const devices = await this.call('VM.get_allowed_VIF_devices', vm.$ref)
await Promise.all(mapToArray(vifs, (vif, index) => {
++nVifs
return this._createVif(
vm,
this.getObject(vif.network),
{
ipv4_allowed: vif.ipv4_allowed,
ipv6_allowed: vif.ipv6_allowed,
device: devices[index],
locking_mode: isEmpty(vif.ipv4_allowed) && isEmpty(vif.ipv6_allowed) ? 'network_default' : 'locked',
mac: vif.mac,
mtu: vif.mtu
}
)
}))
await Promise.all(mapToArray(vifs, (vif, index) => this._createVif(
vm,
this.getObject(vif.network),
{
ipv4_allowed: vif.ipv4_allowed,
ipv6_allowed: vif.ipv6_allowed,
device: devices[index],
locking_mode: isEmpty(vif.ipv4_allowed) && isEmpty(vif.ipv6_allowed) ? 'network_default' : 'locked',
mac: vif.mac,
mtu: vif.mtu
}
)))
}
// TODO: Assign VGPUs.
if (cloudConfig != null) {
// Refresh the record.
vm = await this._waitObjectState(vm.$id, vm => vm.VBDs.length === nVbds)
await this.barrier('VM', vm.$ref)
vm = this.getObjectByRef(vm.$ref)
// Find the SR of the first VDI.
let srRef
@ -221,15 +211,10 @@ export default {
? 'createCoreOsCloudInitConfigDrive'
: 'createCloudInitConfigDrive'
await this[method](vm.$id, srRef, cloudConfig)
++nVbds
}
// wait for the record with all the VBDs and VIFs
return this._waitObjectState(vm.$id, vm =>
vm.VBDs.length === nVbds &&
vm.VIFs.length === nVifs
)
return this.barrier('VM', vm.$ref)
},
// High level method to edit a VM.