You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ml...@apache.org on 2012/11/29 21:50:29 UTC
git commit: Summary: Pull patch from 4.0 that skips deleting patchVbd
when systemvms are stopped
Updated Branches:
refs/heads/master a28f4cac3 -> 5aad7cc30
Summary: Pull patch from 4.0 that skips deleting patchVbd when systemvms are
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 <ma...@betterservers.com> 1354222160 -0700
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5aad7cc3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5aad7cc3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5aad7cc3
Branch: refs/heads/master
Commit: 5aad7cc307404e738ac12cf83d3a72c6c4e61649
Parents: a28f4ca
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Thu Nov 29 13:49:20 2012 -0700
Committer: Marcus Sorensen <ma...@betterservers.com>
Committed: Thu Nov 29 13:49:20 2012 -0700
----------------------------------------------------------------------
.../kvm/resource/LibvirtComputingResource.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5aad7cc3/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
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 41ee1dd..b5af784 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
@@ -2651,13 +2651,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());
}
- }
+ }*/
}
for (InterfaceDef iface: ifaces) {
_vifDriver.unplug(iface);