Remove iSCSI targets and rescan asynchronously

Author: Mike Tutkowski

plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java

@@ -2813,9 +2813,9 @@ public void handleTargets(boolean add, ModifyTargetsCommand.TargetTypeToRemove t
                 }
             }
 
-            boolean rescan = false;
-
             if (add) {
+                boolean rescan = false;
+
                 if (staticTargetsForHost.size() > 0) {
                     addRemoveInternetScsiTargetsToAllHosts(true, getTargets(staticTargetsForHost), hosts);
 
@@ -2825,25 +2825,31 @@ public void handleTargets(boolean add, ModifyTargetsCommand.TargetTypeToRemove t
                 if (dynamicTargetsForHost.size() > 0) {
                     rescan = true;
                 }
+
+                if (rescan) {
+                    rescanAllHosts(hosts, true, false);
+                }
             }
             else {
+                boolean rescan = false;
+
                 if (staticTargetsForHost.size() > 0 &&
                         (ModifyTargetsCommand.TargetTypeToRemove.STATIC.equals(targetTypeToRemove) || ModifyTargetsCommand.TargetTypeToRemove.BOTH.equals(targetTypeToRemove))) {
-                    addRemoveInternetScsiTargetsToAllHosts(false, getTargets(staticTargetsForHost), hosts);
+                    addRemoveInternetScsiTargetsToAllHostsAsync(false, getTargets(staticTargetsForHost), hosts);
 
                     rescan = true;
                 }
 
                 if (dynamicTargetsForHost.size() > 0 &&
                         (ModifyTargetsCommand.TargetTypeToRemove.DYNAMIC.equals(targetTypeToRemove) || ModifyTargetsCommand.TargetTypeToRemove.BOTH.equals(targetTypeToRemove))) {
-                    addRemoveInternetScsiTargetsToAllHosts(false, getTargets(dynamicTargetsForHost), hosts);
+                    addRemoveInternetScsiTargetsToAllHostsAsync(false, getTargets(dynamicTargetsForHost), hosts);
 
                     rescan = true;
                 }
-            }
 
-            if (rescan) {
-                rescanAllHosts(hosts, true, false);
+                if (rescan) {
+                    rescanAllHostsAsync(hosts, true, false);
+                }
             }
         }
     }
@@ -2861,7 +2867,19 @@ private void addRemoveInternetScsiTargetsToAllHosts(VmwareContext context, final
         addRemoveInternetScsiTargetsToAllHosts(add, targets, hosts);
     }
 
-    private void addRemoveInternetScsiTargetsToAllHosts(final boolean add, final List<HostInternetScsiHbaStaticTarget> targets,
+    private void addRemoveInternetScsiTargetsToAllHostsAsync(boolean add, List<HostInternetScsiHbaStaticTarget> targets,
+                                                             List<HostMO> hosts) throws Exception {
+        new Thread(() -> {
+            try {
+                addRemoveInternetScsiTargetsToAllHosts(add, targets, hosts);
+            }
+            catch (Exception ex) {
+                s_logger.warn(ex.getMessage());
+            }
+        }).run();
+    }
+
+    private void addRemoveInternetScsiTargetsToAllHosts(boolean add, List<HostInternetScsiHbaStaticTarget> targets,
                                                         List<HostMO> hosts) throws Exception {
         ExecutorService executorService = Executors.newFixedThreadPool(hosts.size());
 
@@ -2924,6 +2942,17 @@ private void rescanAllHosts(VmwareContext context, List<Pair<ManagedObjectRefere
         rescanAllHosts(hosts, rescanHba, rescanVmfs);
     }
 
+    private void rescanAllHostsAsync(List<HostMO> lstHosts, boolean rescanHba, boolean rescanVmfs) throws Exception {
+        new Thread(() -> {
+            try {
+                rescanAllHosts(lstHosts, rescanHba, rescanVmfs);
+            }
+            catch (Exception ex) {
+                s_logger.warn(ex.getMessage());
+            }
+        }).run();
+    }
+
     private void rescanAllHosts(List<HostMO> lstHosts, boolean rescanHba, boolean rescanVmfs) throws Exception {
         if (!rescanHba && !rescanVmfs) {
             // nothing to do