Repository: airavata Updated Branches: refs/heads/master 2b73d478b -> 45e0185cc
stdout/error was not avaiable so retry 3 times. AIRAVATA-1449 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7c803ce7 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7c803ce7 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7c803ce7 Branch: refs/heads/master Commit: 7c803ce7d17ecde4876b0a3e836f204c24b60470 Parents: 72f3524 Author: raminder <[email protected]> Authored: Fri Sep 26 12:26:33 2014 -0400 Committer: raminder <[email protected]> Committed: Fri Sep 26 12:26:33 2014 -0400 ---------------------------------------------------------------------- .../airavata/gfac/gsissh/handler/GSISSHOutputHandler.java | 9 +++++++-- .../apache/airavata/gfac/ssh/handler/SSHOutputHandler.java | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/7c803ce7/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java index bcf6df1..a870e52 100644 --- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java +++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java @@ -168,8 +168,13 @@ public class GSISSHOutputHandler extends AbstractRecoverableHandler { int i = 0; localStdOutFile = new File(outputDataDir + File.separator + timeStampedExperimentID + "stdout"); while(stdOutStr.isEmpty()){ - cluster.scpFrom(app.getStandardOutput(), localStdOutFile.getAbsolutePath()); - stdOutStr = GFacUtils.readFileToString(localStdOutFile.getAbsolutePath()); + try { + cluster.scpFrom(app.getStandardOutput(), localStdOutFile.getAbsolutePath()); + stdOutStr = GFacUtils.readFileToString(localStdOutFile.getAbsolutePath()); + } catch (Exception e) { + log.error(e.getLocalizedMessage()); + Thread.sleep(2000); + } i++; if(i==3)break; } http://git-wip-us.apache.org/repos/asf/airavata/blob/7c803ce7/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java index 71f39c8..ce63ddc 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java @@ -142,8 +142,13 @@ public class SSHOutputHandler extends AbstractHandler { int i = 0; String stdOutStr = ""; while(stdOutStr.isEmpty()){ - cluster.scpFrom(app.getStandardOutput(), localStdOutFile.getAbsolutePath()); - stdOutStr = GFacUtils.readFileToString(localStdOutFile.getAbsolutePath()); + try { + cluster.scpFrom(app.getStandardOutput(), localStdOutFile.getAbsolutePath()); + stdOutStr = GFacUtils.readFileToString(localStdOutFile.getAbsolutePath()); + } catch (Exception e) { + log.error(e.getLocalizedMessage()); + Thread.sleep(2000); + } i++; if(i == 3) break; }
