Minor refactor

Author: nvazquez

agent/bindir/rolling-maintenance.in

@@ -28,11 +28,14 @@ logging.basicConfig(filename=LOG_FILE,
                     level=logging.INFO)
 logger = logging.getLogger('rolling-maintenance')
 
-def execute_script(stage, script):
+def execute_script(stage, script, payload):
     logger.info("Executing script: %s for stage: %s" % (script, stage))
 
     try:
-       command = '. ' + script
+       command = script
+       if payload:
+           logger.info("Adding payload: %s" % payload)
+           command += " " + payload
        pout = Popen(command, shell=True, stdout=PIPE)
        exitStatus = pout.wait()
        output = pout.communicate()[0]
@@ -48,15 +51,18 @@ def execute_script(stage, script):
       sys.exit(1)
 
 if __name__ == '__main__':
-    if len(sys.argv) != 2:
-        logger.error("Wrong number of parameters received, STAGE,SCRIPT expected")
+    if len(sys.argv) < 2:
+        logger.error("Wrong number of parameters received, STAGE,SCRIPT[,PAYLOAD] expected")
         sys.exit(0)
 
     args = sys.argv[1]
     params = args.split(',')
     stage = params[0]
     script = params[1]
-    logger.info("Received parameters: stage: %s and script: %s" % (stage, script))
+    payload = ""
+    if len(params) > 2:
+        payload = params[2]
+    logger.info("Received parameters: stage: %s, script: %s and payload: %s" % (stage, script, payload))
 
-    execute_script(stage, script)
+    execute_script(stage, script, payload)
     logger.info("Finished executing stage: %s (file: %s)" % (stage, script))

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/rolling/maintenance/RollingMaintenanceAgentExecutor.java

@@ -54,7 +54,7 @@ public String getStageExecutionOutput(String stage, File scriptFile) {
     }
 
     @Override
-    public boolean isStageRunning(String stage, File scriptFile) {
+    public boolean isStageRunning(String stage, File scriptFile, String payload) {
         // In case of reconnection, it is assumed that the stage is finished
         return false;
     }

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/rolling/maintenance/RollingMaintenanceExecutor.java

@@ -25,5 +25,5 @@ public interface RollingMaintenanceExecutor {
     File getStageScriptFile(String stage);
     Pair<Boolean, String> startStageExecution(String stage, File scriptFile, long timeout, String payload);
     String getStageExecutionOutput(String stage, File scriptFile);
-    boolean isStageRunning(String stage, File scriptFile);
+    boolean isStageRunning(String stage, File scriptFile, String payload);
 }

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/rolling/maintenance/RollingMaintenanceServiceExecutor.java

@@ -34,12 +34,12 @@ public RollingMaintenanceServiceExecutor(String hooksDir) {
         super(hooksDir);
     }
 
-    private String invokeService(String action, String stage, String file) {
+    private String invokeService(String action, String stage, String file, String payload) {
         s_logger.debug("Invoking rolling maintenance service for stage: " + stage + "and file " + file + " with action: " + action);
         final OutputInterpreter.AllLinesParser parser = new OutputInterpreter.AllLinesParser();
         Script command = new Script("/bin/systemctl", s_logger);
         command.add(action);
-        String service = String.format("%s@%s,%s", servicePrefix, stage, file);
+        String service = String.format("%s@%s,%s,%s", servicePrefix, stage, file, payload);
         command.add(service);
         String result = command.execute(parser);
         int exitValue = command.getExitValue();
@@ -54,7 +54,7 @@ private String invokeService(String action, String stage, String file) {
     public Pair<Boolean, String> startStageExecution(String stage, File scriptFile, long timeout, String payload) {
         checkHooksDirectory();
         setTimeout(timeout);
-        String result = invokeService("start", stage, scriptFile.getAbsolutePath());
+        String result = invokeService("start", stage, scriptFile.getAbsolutePath(), payload);
         if (StringUtils.isNotBlank(result)) {
             throw new CloudRuntimeException("Error starting stage: " + stage + " execution: " + result);
         }
@@ -68,10 +68,10 @@ public String getStageExecutionOutput(String stage, File scriptFile) {
     }
 
     @Override
-    public boolean isStageRunning(String stage, File scriptFile) {
-        String result = invokeService("is-active", stage, scriptFile.getAbsolutePath());
+    public boolean isStageRunning(String stage, File scriptFile, String payload) {
+        String result = invokeService("is-active", stage, scriptFile.getAbsolutePath(), payload);
         if (StringUtils.isNotBlank(result) && result.equals("failed")) {
-            String status = invokeService("status", stage, scriptFile.getAbsolutePath());
+            String status = invokeService("status", stage, scriptFile.getAbsolutePath(), payload);
             String errorMsg = "Stage " + stage + " execution failed, status: " + status;
             s_logger.error(errorMsg);
             throw new CloudRuntimeException(errorMsg);

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

@@ -52,7 +52,7 @@ public RollingMaintenanceAnswer execute(RollingMaintenanceCommand command, Libvi
             if (!command.isStarted()) {
                 executor.startStageExecution(stage, scriptFile, timeout, payload);
             }
-            if (executor.isStageRunning(stage, scriptFile)) {
+            if (executor.isStageRunning(stage, scriptFile, payload)) {
                 return new RollingMaintenanceAnswer(command, true, "Stage " + stage + " still running", false);
             }
             String output = executor.getStageExecutionOutput(stage, scriptFile);