apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Summary: Pull patch from 4.0 that skips deleting patchVbd when systemvms are

Browse Source 
stopped

Detail: This patch fixed an issue with hosts trying to stop system vms that were
already not running and deleting a patch disk for the system vm running on
another host. It got applied to 4.0 but not master.

Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1354222160 -0700
This commit is contained in:
Marcus Sorensen 2012-11-29 13:49:20 -07:00
parent a28f4cac3c
commit 5aad7cc307
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
View File

@ -2651,13 +2651,14 @@ public class LibvirtComputingResource extends ServerResourceBase implements
if (disk.getDeviceType() == DiskDef.deviceType.CDROM if (disk.getDeviceType() == DiskDef.deviceType.CDROM
&& disk.getDiskPath() != null) { && disk.getDiskPath() != null) {
cleanupDisk(conn, disk); 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") && disk.getDiskPath().contains(vmName + "-patchdisk")
&& vmName.matches("^[rsv]-\\d+-VM$")) { && vmName.matches("^[rsv]-\\d+-VM$")) {
if (!_storagePoolMgr.deleteVbdByPath(disk.getDiskPath())) { if (!_storagePoolMgr.deleteVbdByPath(disk.getDiskPath())) {
s_logger.warn("failed to delete patch disk " + disk.getDiskPath()); s_logger.warn("failed to delete patch disk " + disk.getDiskPath());
} }
} }*/
} }
for (InterfaceDef iface: ifaces) { for (InterfaceDef iface: ifaces) {
_vifDriver.unplug(iface); _vifDriver.unplug(iface);