Repository: airavata Updated Branches: refs/heads/master f37dad87a -> 34e0b87e2
Create working directory was called twice. Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/34e0b87e Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/34e0b87e Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/34e0b87e Branch: refs/heads/master Commit: 34e0b87e2a57366b695d71a3560dbcfb7bc93d6c Parents: f37dad8 Author: raminder <[email protected]> Authored: Wed Aug 13 23:07:49 2014 -0400 Committer: raminder <[email protected]> Committed: Wed Aug 13 23:07:49 2014 -0400 ---------------------------------------------------------------------- .../gfac/gsissh/handler/GSISSHDirectorySetupHandler.java | 1 - .../airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java | 1 - .../java/org/apache/airavata/gsi/ssh/impl/RawCommandInfo.java | 6 ++++-- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/34e0b87e/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHDirectorySetupHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHDirectorySetupHandler.java b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHDirectorySetupHandler.java index e676b4b..b647153 100644 --- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHDirectorySetupHandler.java +++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHDirectorySetupHandler.java @@ -70,7 +70,6 @@ public class GSISSHDirectorySetupHandler extends AbstractRecoverableHandler { String workingDirectory = app.getScratchWorkingDirectory(); cluster.makeDirectory(workingDirectory); - cluster.makeDirectory(app.getScratchWorkingDirectory()); cluster.makeDirectory(app.getInputDataDirectory()); cluster.makeDirectory(app.getOutputDataDirectory()); DataTransferDetails detail = new DataTransferDetails(); http://git-wip-us.apache.org/repos/asf/airavata/blob/34e0b87e/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java index b29f22b..e017e97 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java @@ -73,7 +73,6 @@ public class SSHDirectorySetupHandler extends AbstractHandler { ApplicationDeploymentDescriptionType app = jobExecutionContext.getApplicationContext().getApplicationDeploymentDescription().getType(); String workingDirectory = app.getScratchWorkingDirectory(); cluster.makeDirectory(workingDirectory); - cluster.makeDirectory(app.getScratchWorkingDirectory()); cluster.makeDirectory(app.getInputDataDirectory()); cluster.makeDirectory(app.getOutputDataDirectory()); DataTransferDetails detail = new DataTransferDetails(); http://git-wip-us.apache.org/repos/asf/airavata/blob/34e0b87e/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/RawCommandInfo.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/RawCommandInfo.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/RawCommandInfo.java index ab85925..7f68036 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/RawCommandInfo.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/RawCommandInfo.java @@ -48,9 +48,11 @@ public class RawCommandInfo implements CommandInfo { public String getRawCommand() { return rawCommand; } - + /* + * To get command without the path and other parameters. This is required to read errors + */ public String getBaseCommand() { - return rawCommand.substring(0, rawCommand.indexOf(" ")); + return rawCommand.substring(rawCommand.lastIndexOf("/")+1, rawCommand.indexOf(" ")); } public void setRawCommand(String rawCommand) {
