incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kis...@apache.org
Subject git commit: Summary: Pass StoragePoolType that maps to libvirt in cleanupDisk
Date Fri, 18 Jan 2013 08:04:31 GMT
Updated Branches:
  refs/heads/network-refactor 318ff6a77 -> 0306d2f52


Summary: Pass StoragePoolType that maps to libvirt in cleanupDisk

Description: When selecting a storage adaptor, cleanupDisk assumes that
libvirt is being used. Therefore, we pass a StoragePoolType that maps to
libvirt. This is the only place in LibvirtComputingResource where the
StoragePoolType can't be pulled from somewhere else.

BUG-ID: CLOUDSTACK-1011
Signed-off-by: Marcus Sorensen <marcus@betterservers.com>


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

Branch: refs/heads/network-refactor
Commit: 0306d2f52dfdc768bbb3b0e4cc520e4790c8198b
Parents: 318ff6a
Author: Marcus Sorensen <marcus@betterservers.com>
Authored: Fri Jan 18 00:20:34 2013 -0700
Committer: Kishan Kavala <kishan@cloud.com>
Committed: Fri Jan 18 13:30:55 2013 +0530

----------------------------------------------------------------------
 .../kvm/resource/LibvirtComputingResource.java     |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0306d2f5/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 b52e2d8..90d3dde 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
@@ -3149,8 +3149,11 @@ public class LibvirtComputingResource extends ServerResourceBase implements
         }
 
         try {
-            //we use libvirt since we passed a libvirt connection to cleanupDisk
-            KVMStoragePool pool = _storagePoolMgr.getStoragePool(null, poolUuid);
+            // we use libvirt as storage adaptor since we passed a libvirt
+            // connection to cleanupDisk. We pass a storage type that maps
+            // to libvirt adaptor.
+            KVMStoragePool pool = _storagePoolMgr.getStoragePool(
+                                      StoragePoolType.Filesystem, poolUuid);
             if (pool != null) {
                 pool.delete();
             }


Mime
View raw message