From c8afd816965786441e4b6f855b141d7515f15f6a Mon Sep 17 00:00:00 2001 From: Marcus Sorensen Date: Fri, 5 Oct 2012 16:26:37 -0700 Subject: [PATCH] KVM: Don't delete systemvm patch disks on StopCommand Signed-off-by: Edison Su --- .../hypervisor/kvm/resource/LibvirtComputingResource.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index 22b149f5323..f5ebca0da0a 100755 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -2589,13 +2589,14 @@ public class LibvirtComputingResource extends ServerResourceBase implements if (disk.getDeviceType() == DiskDef.deviceType.CDROM && disk.getDiskPath() != null) { cleanupDisk(conn, disk); - } else if (disk.getDiskPath() != null + } /* The clean up of patch disks should probably be done in expunge + else if (disk.getDiskPath() != null && disk.getDiskPath().contains(vmName + "-patchdisk") && vmName.matches("^[rsv]-\\d+-VM$")) { if (!_storagePoolMgr.deleteVbdByPath(disk.getDiskPath())) { s_logger.warn("failed to delete patch disk " + disk.getDiskPath()); } - } + }*/ } }