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 0911b73
Date Wed, 08 Jan 2014 16:42:33 GMT
Updated Branches:
  refs/heads/master 612a41e3f -> 0911b73c8


CLOUDSTACK-5430: NPE can be thrown in disconnectPhysicalDiskViaVmSpec in
certain failure scenarios. This can only be triggered if other bugs allow
pools to be deleted while VMs are using them.


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

Branch: refs/heads/master
Commit: 0911b73c830600c063c3926134c60978ea536fea
Parents: 612a41e
Author: Marcus Sorensen <marcus@betterservers.com>
Authored: Wed Jan 8 09:39:19 2014 -0700
Committer: Marcus Sorensen <marcus@betterservers.com>
Committed: Wed Jan 8 09:42:19 2014 -0700

----------------------------------------------------------------------
 .../com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0911b73c/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
index fefb29c..9e07e4b 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
@@ -171,6 +171,11 @@ public class KVMStoragePoolManager {
 
                 KVMStoragePool pool = getStoragePool(store.getPoolType(), store.getUuid());
 
+                if (pool == null) {
+                    s_logger.error("Pool " + store.getUuid() + " of type " + store.getPoolType()
+ " was not found, skipping disconnect logic");
+                    continue;
+                }
+
                 StorageAdaptor adaptor = getStorageAdaptor(pool.getType());
 
                 // if a disk fails to disconnect, still try to disconnect remaining


Mime
View raw message