Repository: airavata Updated Branches: refs/heads/master 12c605453 -> 96c11552b
fixing session timeout related to ssh operations Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/49e74f57 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/49e74f57 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/49e74f57 Branch: refs/heads/master Commit: 49e74f57c6309acd8f54f99de9f670587d9d75e1 Parents: 7437e11 Author: lahiru <[email protected]> Authored: Thu Mar 13 17:42:16 2014 -0400 Committer: lahiru <[email protected]> Committed: Thu Mar 13 17:42:16 2014 -0400 ---------------------------------------------------------------------- .../airavata/gfac/handler/SCPOutputHandler.java | 2 ++ .../airavata/gsi/ssh/impl/GSISSHAbstractCluster.java | 14 +++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/49e74f57/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/SCPOutputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/SCPOutputHandler.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/SCPOutputHandler.java index 78bb960..10287a5 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/SCPOutputHandler.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/SCPOutputHandler.java @@ -96,7 +96,9 @@ public class SCPOutputHandler extends AbstractHandler{ localStdErrFile = new File(outputDataDir + File.separator + timeStampedServiceName + "stderr"); // cluster.makeDirectory(outputDataDir); cluster.scpFrom(app.getStandardOutput(), localStdOutFile.getAbsolutePath()); + Thread.sleep(1000); cluster.scpFrom(app.getStandardError(), localStdErrFile.getAbsolutePath()); + Thread.sleep(1000); String stdOutStr = GFacUtils.readFileToString(localStdOutFile.getAbsolutePath()); String stdErrStr = GFacUtils.readFileToString(localStdErrFile.getAbsolutePath()); http://git-wip-us.apache.org/repos/asf/airavata/blob/49e74f57/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java index 87416e1..0a26589 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java @@ -344,6 +344,9 @@ public class GSISSHAbstractCluster implements Cluster { public void scpTo(String remoteFile, String localFile) throws SSHApiException { try { + if(!session.isConnected()){ + session.connect(); + } log.info("Transfering file:/" + localFile + " To:" + serverInfo.getHost() + ":" + remoteFile); SSHUtils.scpTo(remoteFile, localFile, session); } catch (IOException e) { @@ -357,7 +360,10 @@ public class GSISSHAbstractCluster implements Cluster { public void scpFrom(String remoteFile, String localFile) throws SSHApiException { try { - log.info("Transfering from:"+ serverInfo + ":" + remoteFile + " To:" + "file:/" + localFile); + if(!session.isConnected()){ + session.connect(); + } + log.info("Transfering from:"+ serverInfo.getHost() + ":" + remoteFile + " To:" + "file:/" + localFile); SSHUtils.scpFrom(remoteFile, localFile, session); } catch (IOException e) { throw new SSHApiException("Failed during scping local file:" + localFile + " to remote file " @@ -370,6 +376,9 @@ public class GSISSHAbstractCluster implements Cluster { public void makeDirectory(String directoryPath) throws SSHApiException { try { + if(!session.isConnected()){ + session.connect(); + } log.info("Creating directory: " + serverInfo.getHost() + ":" + directoryPath); SSHUtils.makeDirectory(directoryPath, session); } catch (IOException e) { @@ -383,6 +392,9 @@ public class GSISSHAbstractCluster implements Cluster { public List<String> listDirectory(String directoryPath) throws SSHApiException { try { + if(!session.isConnected()){ + session.connect(); + } log.info("Listing directory: " + serverInfo.getHost() + ":" + directoryPath); return SSHUtils.listDirectory(directoryPath, session); } catch (IOException e) {
