Added agent property 'powerflex.sdc.service.wait' for the time (in secs) to wait after SDC service start/restart/stop

Author: sureshanaparti

agent/src/main/java/com/cloud/agent/properties/AgentProperties.java

@@ -823,7 +823,7 @@ public static class Property <T>{
         private T defaultValue;
         private Class<T> typeClass;
 
-        Property(String name, T value) {
+        public Property(String name, T value) {
             init(name, value);
         }
 

plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/util/ScaleIOUtil.java

@@ -17,6 +17,8 @@
 
 package org.apache.cloudstack.storage.datastore.util;
 
+import com.cloud.agent.properties.AgentProperties;
+import com.cloud.agent.properties.AgentPropertiesFileHandler;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 
@@ -60,6 +62,14 @@ public class ScaleIOUtil {
     private static final String SDC_SERVICE_ENABLE_CMD = "systemctl enable scini";
 
     public static final String CONNECTED_SDC_COUNT_STAT = "ConnectedSDCCount";
+
+    /**
+     * Time (in seconds) to wait after SDC service 'scini' start/restart/stop.<br>
+     * Data type: Integer.<br>
+     * Default value: <code>3</code>
+     */
+    public static final AgentProperties.Property<Integer> SDC_SERVICE_ACTION_WAIT = new AgentProperties.Property<>("powerflex.sdc.service.wait", 3);
+
     /**
      * Cmd for querying volumes in SDC
      * Sample output for cmd: drv_cfg --query_vols:
@@ -219,7 +229,7 @@ public static boolean startSDCService() {
         if (exitValue != 0) {
             return false;
         }
-        waitForSecs(3);
+        waitForSdcServiceActionToComplete();
         return true;
     }
 
@@ -228,7 +238,7 @@ public static boolean stopSDCService() {
         if (exitValue != 0) {
             return false;
         }
-        waitForSecs(1);
+        waitForSdcServiceActionToComplete();
         return true;
     }
 
@@ -237,16 +247,19 @@ public static boolean restartSDCService() {
         if (exitValue != 0) {
             return false;
         }
-        waitForSecs(3);
+        waitForSdcServiceActionToComplete();
         return true;
     }
 
-    private static void waitForSecs(long waitTimeInSecs) {
+    private static void waitForSdcServiceActionToComplete() {
+        // Wait for the SDC service to settle after start/restart/stop and reaches a stable state
+        int waitTimeInSecs = AgentPropertiesFileHandler.getPropertyValue(SDC_SERVICE_ACTION_WAIT);
         if (waitTimeInSecs < 0) {
-            waitTimeInSecs = 1;
+            waitTimeInSecs = SDC_SERVICE_ACTION_WAIT.getDefaultValue();
         }
         try {
-            Thread.sleep(waitTimeInSecs * 1000);
+            LOGGER.debug(String.format("Waiting for %d secs after SDC service action, to reach a stable state", waitTimeInSecs));
+            Thread.sleep(waitTimeInSecs * 1000L);
         } catch (InterruptedException ignore) {
         }
     }