You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by jb...@apache.org on 2016/09/10 21:19:19 UTC
[1/2] git commit: updated refs/heads/4.9 to a661a11
Repository: cloudstack
Updated Branches:
refs/heads/4.9 de73bdd5a -> a661a11d7
CLOUDSTACK-9470: Fix for SshHelper - test_network_acl was failing on Vmware due to a bug in sshExecute, in which value returned was null and there was still stdout to consume. This fix addresses this problem, consuming stdout peoperly to return expected value in sshExecute
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1190d76a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1190d76a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1190d76a
Branch: refs/heads/4.9
Commit: 1190d76a65e93eefec7c19255e07cea18cf4db1f
Parents: 0671a80
Author: nvazquez <ni...@gmail.com>
Authored: Wed Aug 24 09:32:55 2016 -0300
Committer: nvazquez <ni...@gmail.com>
Committed: Fri Sep 2 12:16:58 2016 -0300
----------------------------------------------------------------------
.../src/main/java/com/cloud/utils/ssh/SshHelper.java | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1190d76a/utils/src/main/java/com/cloud/utils/ssh/SshHelper.java
----------------------------------------------------------------------
diff --git a/utils/src/main/java/com/cloud/utils/ssh/SshHelper.java b/utils/src/main/java/com/cloud/utils/ssh/SshHelper.java
index 4d7a852..1f6d30c 100644
--- a/utils/src/main/java/com/cloud/utils/ssh/SshHelper.java
+++ b/utils/src/main/java/com/cloud/utils/ssh/SshHelper.java
@@ -22,6 +22,10 @@ package com.cloud.utils.ssh;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
@@ -196,6 +200,16 @@ public class SshHelper {
String result = sbResult.toString();
+ if (StringUtils.isBlank(result)) {
+ try {
+ result = IOUtils.toString(stdout, StandardCharsets.UTF_8);
+ }
+ catch (IOException e) {
+ s_logger.error("Couldn't get content of input stream due to: " + e.getMessage());
+ return new Pair<Boolean, String>(false, result);
+ }
+ }
+
if (sess.getExitStatus() == null) {
//Exit status is NOT available. Returning failure result.
s_logger.error(String.format("SSH execution of command %s has no exit status set. Result output: %s", command, result));
[2/2] git commit: updated refs/heads/4.9 to a661a11
Posted by jb...@apache.org.
Signed-off-by: John Burwell <me...@cockamamy.net>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a661a11d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a661a11d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a661a11d
Branch: refs/heads/4.9
Commit: a661a11d768f0355feef88b5946dce736bac70f8
Parents: de73bdd 1190d76
Author: John Burwell <me...@cockamamy.net>
Authored: Sat Sep 10 17:18:07 2016 -0400
Committer: John Burwell <me...@cockamamy.net>
Committed: Sat Sep 10 17:18:07 2016 -0400
----------------------------------------------------------------------
.../src/main/java/com/cloud/utils/ssh/SshHelper.java | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------