Skip to content

Commit 6601541

Browse files
Fix for NFS3 primary storage pool is failing to come out of maintenance mode
1 parent 7501ce8 commit 6601541

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

‎plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,10 +426,10 @@ public boolean deleteStoragePool(StoragePoolType type, String uuid) {
426426

427427
public boolean deleteStoragePool(StoragePoolType type, String uuid, Map<String, String> details) {
428428
StorageAdaptor adaptor = getStorageAdaptor(type);
429+
boolean deleteStatus = adaptor.deleteStoragePool(uuid, details);
429430
if (type == StoragePoolType.NetworkFilesystem) {
430431
_haMonitor.removeStoragePool(uuid);
431432
}
432-
boolean deleteStatus = adaptor.deleteStoragePool(uuid, details);
433433
synchronized (_storagePools) {
434434
_storagePools.remove(uuid);
435435
}

‎plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -905,6 +905,11 @@ private boolean destroyStoragePoolHandleException(Connect conn, String uuid)
905905
return false;
906906
}
907907

908+
@Override
909+
public boolean deleteStoragePool(String uuid, Map<String, String> details) {
910+
return deleteStoragePool(uuid);
911+
}
912+
908913
@Override
909914
public boolean deleteStoragePool(String uuid) {
910915
logger.info("Attempting to remove storage pool " + uuid + " from libvirt");

0 commit comments

Comments
 (0)