Skip to content

Commit ef3c3f1

Browse files
Fix sdc usage cmd (drv_cfg) result, and log command result
1 parent 21d5813 commit ef3c3f1

File tree

2 files changed

+3
-2
lines changed
  • plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/util
  • utils/src/main/java/com/cloud/utils/script

2 files changed

+3
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,8 +321,8 @@ public static boolean isRemoveMdmCliSupported() {
321321
String command = SDC_HOME_PATH + "/bin/" + USAGE_CMD;
322322

323323
Pair<String, String> result = Script.executeCommand(command);
324-
String stdErr = result.first();
325-
String stdOut = result.second();
324+
String stdOut = result.first();
325+
String stdErr = result.second();
326326

327327
/*
328328
* Check whether stderr or stdout contains mdm removal "--remove_mdm" parameter.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -687,6 +687,7 @@ public static Pair<String, String> executeCommand(String command) {
687687
OutputInterpreter.AllLinesParser parser = new OutputInterpreter.AllLinesParser();
688688
String stdErr = script.execute(parser);
689689
String stdOut = parser.getLines();
690+
LOGGER.debug(String.format("Command [%s] result - stdout: [%s], stderr: [%s]", command, stdOut, stdErr));
690691
return new Pair<>(stdOut, stdErr);
691692
}
692693

0 commit comments

Comments
 (0)