From 44c73fdceff6479b9946d8a782757a1c8da3ef65 Mon Sep 17 00:00:00 2001 From: Marcus Sorensen Date: Wed, 8 Jan 2014 09:39:19 -0700 Subject: [PATCH] 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. --- .../cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java | 5 +++++ 1 file changed, 5 insertions(+) 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 9ca709c3ca3..42af993beb5 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