From ce3550f33338bc0bafacae5bdca8de8905bf31cc Mon Sep 17 00:00:00 2001
From: Anthony Xu <anthony.xu@citrix.com>
Date: Wed, 18 Jun 2014 15:05:24 -0700
Subject: [PATCH] CLOUDSTACK-6662 CLOUDSTACK-6844

 exit status delivery might get delayed

 Please enter the commit message for your changes. Lines starting
---
 utils/src/com/cloud/utils/ssh/SSHCmdHelper.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/utils/src/com/cloud/utils/ssh/SSHCmdHelper.java b/utils/src/com/cloud/utils/ssh/SSHCmdHelper.java
index 4a440eff4e3..e35a3ea680b 100644
--- a/utils/src/com/cloud/utils/ssh/SSHCmdHelper.java
+++ b/utils/src/com/cloud/utils/ssh/SSHCmdHelper.java
@@ -155,8 +155,15 @@ public class SSHCmdHelper {
             String result = sbResult.toString();
             if (result != null && !result.isEmpty())
                 s_logger.debug(cmd + " output:" + result);
-
-             return sshSession.getExitStatus();
+            // exit status delivery might get delayed
+            for(int i = 0 ; i<10 ; i++ ) {
+                Integer status = sshSession.getExitStatus();
+                if( status != null ) {
+                    return status;
+                }
+                Thread.sleep(100);
+            }
+            return -1;
         } catch (Exception e) {
             s_logger.debug("Ssh executed failed", e);
             throw new SshException("Ssh executed failed " + e.getMessage());