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 2014/01/08 17:41:53 UTC
git commit: updated refs/heads/4.3 to 44c73fd
Updated Branches:
refs/heads/4.3 4bb85cd7f -> 44c73fdce
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/44c73fdc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/44c73fdc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/44c73fdc
Branch: refs/heads/4.3
Commit: 44c73fdceff6479b9946d8a782757a1c8da3ef65
Parents: 4bb85cd
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Wed Jan 8 09:39:19 2014 -0700
Committer: Marcus Sorensen <ma...@betterservers.com>
Committed: Wed Jan 8 09:41:40 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/44c73fdc/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 9ca709c..42af993 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
@@ -178,6 +178,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