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/4.3 to 8c2c37f
Date Fri, 27 Dec 2013 06:13:54 GMT
Updated Branches:
  refs/heads/4.3 0478aee78 -> 8c2c37f8b


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/8c2c37f8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8c2c37f8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8c2c37f8

Branch: refs/heads/4.3
Commit: 8c2c37f8b051efc7e28290288c247d05371c28ec
Parents: 0478aee
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:13:41 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/8c2c37f8/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 9402d0f..7e3c9e0 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
@@ -715,10 +715,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