cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mlsoren...@apache.org
Subject git commit: updated refs/heads/master to bb8b280
Date Fri, 27 Dec 2013 06:14:33 GMT
Updated Branches:
  refs/heads/master 07de75191 -> bb8b2805b


CLOUDSTACK-5432: KVM - LibvirtStorageAdaptor only needs to disconnectPhysicalDiskByPath
for ISO-based disks. At least, that's how it was in 4.2, so restoring to that functionality.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bb8b2805
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bb8b2805
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bb8b2805

Branch: refs/heads/master
Commit: bb8b2805b67515a2ae7967d4d2240fc56c3b1b3a
Parents: 07de751
Author: Marcus Sorensen <marcus@betterservers.com>
Authored: Thu Dec 26 23:12:37 2013 -0700
Committer: Marcus Sorensen <marcus@betterservers.com>
Committed: Thu Dec 26 23:14:23 2013 -0700

----------------------------------------------------------------------
 .../com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb8b2805/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
index f910813..fafbee0 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
@@ -684,10 +684,8 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
     @Override
     public boolean disconnectPhysicalDiskByPath(String localPath) {
         // we've only ever cleaned up ISOs that are NFS mounted
-
         String poolUuid = null;
-
-        if (localPath != null && localPath.startsWith(_mountPoint)) {
+        if (localPath != null && localPath.startsWith(_mountPoint) && localPath.endsWith(".iso"))
{
             String[] token = localPath.split("/");
 
             if (token.length > 3) {


Mime
View raw message