Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 06:16:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CA-115429: Fixed: Deletion of snapshot is successful but XenCenter logs show error.

Browse Source 
XAPI (from 1.7) destroy destroys suspend VDIs as well (code is here: xapi: ocaml/xapi/cli_operations.ml). Depending on actual race conditions, this can lead to a situation when we try to destroy a Suspend VDI that has just been deleted.

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
This commit is contained in:
Gabor Apati-Nagy 2014-05-14 14:41:07 +01:00
parent e6b38e101b
commit 4ee0642a54
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
XenModel/Actions/VM/VMDestroyAction.cs
View File

@ -101,11 +101,15 @@ namespace XenAdmin.Actions.VMActions
}
}
//CA-91072: Delete Suspend image VDI
VDI suspendVDI = vm.Connection.Resolve(vm.suspend_VDI);
if (suspendVDI != null)
vdiRefs.Add(vm.suspend_VDI);
//CA-115429: XAPI does delete suspend VM VDIs on destroy (from version 1.7/Midnight Ride),
//so we should delete them here only when connected to older XS
if (!Helper.APIVersionMeets(session, API_Version.API_1_7))
{
//CA-91072: Delete Suspend image VDI
VDI suspendVDI = vm.Connection.Resolve(vm.suspend_VDI);
if (suspendVDI != null)
vdiRefs.Add(vm.suspend_VDI);
}
XenAPI.VM.destroy(session, vm.opaque_ref);