Fix exception-masking bugs in Script.java and DefaultModuleDefinitionSet

framework/spring/module/src/main/java/org/apache/cloudstack/spring/module/model/impl/DefaultModuleDefinitionSet.java

@@ -145,8 +145,8 @@ public void with(ModuleDefinition def, Stack<ModuleDefinition> parents) {
                         logger.debug("Failed to obtain module context: ", e);
                     }
                 } catch (BeansException e) {
-                    logger.error("Failed to load module [{}] due to: {}", def.getName(), e);
-                    throw new RuntimeException(String.format("Failed to load module [%s]", def.getName()));
+                    logger.error("Failed to load module [{}]", def.getName(), e);
+                    throw new RuntimeException(String.format("Failed to load module [%s]", def.getName()), e);
                 }
             }
         });

utils/src/main/java/com/cloud/utils/script/Script.java

@@ -244,6 +244,20 @@ static String stackTraceAsString(Throwable throwable) {
         }
     }
 
+    /**
+     * Builds the error result of a failed process whose output was drained by the interpreter task.
+     * Draining interpreters (e.g. {@link OutputInterpreter.AllLinesParser}) return null from interpret(),
+     * and callers treat a null result as success, so a non-null value must always be returned here:
+     * the task result, otherwise the output captured by the parser, otherwise the process exit value.
+     */
+    private String getDrainedErrorResult(Task task, OutputInterpreter interpreter) throws InterruptedException {
+        String result = task.getResult();
+        if (StringUtils.isBlank(result) && interpreter instanceof OutputInterpreter.AllLinesParser) {
+            result = ((OutputInterpreter.AllLinesParser) interpreter).getLines();
+        }
+        return StringUtils.isNotBlank(result) ? result.trim() : String.valueOf(_process.exitValue());
+    }
+
     public String execute(OutputInterpreter interpreter) {
         return executeInternal(interpreter, null);
     }
@@ -371,7 +385,7 @@ private String executeInternal(OutputInterpreter interpreter, Map<String, String
 
             String error;
             if (interpreter != null) {
-                error = interpreter.processError(reader);
+                error = interpreter.drain() ? getDrainedErrorResult(task, interpreter) : interpreter.processError(reader);
             } else {
                 error = String.valueOf(_process.exitValue());
             }
@@ -494,7 +508,7 @@ public String executeIgnoreExitValue(OutputInterpreter interpreter, int exitValu
 
             String error;
             if (interpreter != null) {
-                error = interpreter.processError(reader);
+                error = interpreter.drain() ? getDrainedErrorResult(task, interpreter) : interpreter.processError(reader);
             } else {
                 error = String.valueOf(_process.exitValue());
             }