Addressed the comments received on upstream PR for refactoring the fix for NFS Cancel maintenance

Author: sandeeplocharla

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java

@@ -50,6 +50,12 @@ public void addStoragePool(HAStoragePool pool) {
         }
     }
 
+    public void unregisterStoragePool(String uuid) {
+        synchronized (haStoragePools) {
+            haStoragePools.remove(uuid);
+        }
+    }
+
     public void removeStoragePool(String uuid) {
         synchronized (haStoragePools) {
             HAStoragePool pool = haStoragePools.get(uuid);

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

@@ -457,11 +457,12 @@ public synchronized boolean deleteStoragePool(StoragePoolType type, String uuid)
 
     public boolean deleteStoragePool(StoragePoolType type, String uuid, Map<String, String> details) {
         StorageAdaptor adaptor = getStorageAdaptor(type);
-        // For NetworkFilesystem, libvirt will take care of unmounting the nfs mount. If nfs mount has been removed before libvirt's pool
-        // delete, libvirt will throw an error.
-        boolean deleteStatus = adaptor.deleteStoragePool(uuid, details);
+        boolean deleteStatus;
         if (type == StoragePoolType.NetworkFilesystem) {
-            _haMonitor.removeStoragePool(uuid);
+            _haMonitor.unregisterStoragePool(uuid);
+            deleteStatus = adaptor.deleteStoragePool(uuid);
+        } else {
+            deleteStatus = adaptor.deleteStoragePool(uuid, details);
         }
         synchronized (_storagePools) {
             _storagePools.remove(uuid);

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

@@ -891,11 +891,6 @@ private boolean destroyStoragePoolHandleException(Connect conn, String uuid)
         return false;
     }
 
-    @Override
-    public boolean deleteStoragePool(String uuid, Map<String, String> details) {
-        return deleteStoragePool(uuid);
-    }
-
     @Override
     public boolean deleteStoragePool(String uuid) {
         logger.info("Attempting to remove storage pool " + uuid + " from libvirt");

server/src/main/java/com/cloud/storage/StorageManagerImpl.java

@@ -1276,7 +1276,7 @@ public PrimaryDataStoreInfo updateStoragePool(UpdateStoragePoolCmd cmd) throws I
         if (capacityBytes != null) {
             if (capacityBytes != pool.getCapacityBytes()) {
                 updatedCapacityBytes = capacityBytes;
-                 details.put(PrimaryDataStoreLifeCycle.CAPACITY_BYTES, String.valueOf(updatedCapacityBytes));
+                details.put(PrimaryDataStoreLifeCycle.CAPACITY_BYTES, String.valueOf(updatedCapacityBytes));
                 changes = true;
             }
         }
@@ -1286,7 +1286,7 @@ public PrimaryDataStoreInfo updateStoragePool(UpdateStoragePoolCmd cmd) throws I
         if (capacityIops != null) {
             if (!capacityIops.equals(pool.getCapacityIops())) {
                 updatedCapacityIops = capacityIops;
-                 details.put(PrimaryDataStoreLifeCycle.CAPACITY_IOPS, String.valueOf(updatedCapacityIops));
+                details.put(PrimaryDataStoreLifeCycle.CAPACITY_IOPS, String.valueOf(updatedCapacityIops));
                 changes = true;
             }
         }