Repository: airavata Updated Branches: refs/heads/master e853fa2fa -> e2e9d2c47
fixing issues in advancedInput and output handlers Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e2e9d2c4 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e2e9d2c4 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e2e9d2c4 Branch: refs/heads/master Commit: e2e9d2c4789a39063161c2692555002cd5431e75 Parents: e853fa2 Author: Chathuri Wimalasena <[email protected]> Authored: Wed Nov 19 15:00:35 2014 -0500 Committer: Chathuri Wimalasena <[email protected]> Committed: Wed Nov 19 15:00:35 2014 -0500 ---------------------------------------------------------------------- .../gfac/gsissh/handler/GSISSHOutputHandler.java | 6 +++--- .../airavata/gfac/gsissh/util/GFACGSISSHUtils.java | 12 ++++++++++++ .../airavata/gfac/ssh/handler/SSHOutputHandler.java | 6 +++--- .../org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java | 11 +++++++++++ 4 files changed, 29 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/e2e9d2c4/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 68273b8..107f1fe 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 @@ -254,9 +254,9 @@ public class GSISSHOutputHandler extends AbstractRecoverableHandler { } } // Why we set following? -// app.setStandardError(localStdErrFile.getAbsolutePath()); -// app.setStandardOutput(localStdOutFile.getAbsolutePath()); -// app.setOutputDataDirectory(outputDataDir); + jobExecutionContext.setStandardError(localStdErrFile.getAbsolutePath()); + jobExecutionContext.setStandardOutput(localStdOutFile.getAbsolutePath()); + jobExecutionContext.setOutputDir(outputDataDir); status.setTransferState(TransferState.DOWNLOAD); detail.setTransferStatus(status); detail.setTransferDescription(outputDataDir); http://git-wip-us.apache.org/repos/asf/airavata/blob/e2e9d2c4/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java index edd496a..e68effa 100644 --- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java +++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java @@ -43,6 +43,7 @@ import org.apache.airavata.gsi.ssh.util.CommonUtils; import org.apache.airavata.model.appcatalog.appdeployment.ApplicationDeploymentDescription; import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType; import org.apache.airavata.model.appcatalog.computeresource.*; +import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference; import org.apache.airavata.model.workspace.experiment.ComputationalResourceScheduling; import org.apache.airavata.model.workspace.experiment.TaskDetails; import org.slf4j.Logger; @@ -178,6 +179,17 @@ public class GFACGSISSHUtils { jobDescriptor.setExecutablePath(jobExecutionContext.getExecutablePath()); jobDescriptor.setStandardOutFile(jobExecutionContext.getStandardOutput()); jobDescriptor.setStandardErrorFile(jobExecutionContext.getStandardError()); + String computationalProjectAccount = taskData.getTaskScheduling().getComputationalProjectAccount(); + if (computationalProjectAccount == null){ + ComputeResourcePreference computeResourcePreference = jobExecutionContext.getApplicationContext().getComputeResourcePreference(); + if (computeResourcePreference != null) { + computationalProjectAccount = computeResourcePreference.getAllocationProjectNumber(); + } + } + if (computationalProjectAccount != null) { + jobDescriptor.setAcountString(computationalProjectAccount); + } + Random random = new Random(); int i = random.nextInt(Integer.MAX_VALUE); // We always set the job name jobDescriptor.setJobName("A" + String.valueOf(i+99999999)); http://git-wip-us.apache.org/repos/asf/airavata/blob/e2e9d2c4/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 bf01aff..0b8201a 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 @@ -195,9 +195,9 @@ public class SSHOutputHandler extends AbstractHandler { } } // FIXME: why we set standard error ouput and outputDirectory again ? -// app.setStandardError(localStdErrFile.getAbsolutePath()); -// app.setStandardOutput(localStdOutFile.getAbsolutePath()); -// app.setOutputDataDirectory(outputDataDir); + jobExecutionContext.setStandardError(localStdErrFile.getAbsolutePath()); + jobExecutionContext.setStandardOutput(localStdOutFile.getAbsolutePath()); + jobExecutionContext.setOutputDir(outputDataDir); status.setTransferState(TransferState.DOWNLOAD); detail.setTransferStatus(status); detail.setTransferDescription(outputDataDir); http://git-wip-us.apache.org/repos/asf/airavata/blob/e2e9d2c4/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java index 1e9b937..bbc258d 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java @@ -43,6 +43,7 @@ import org.apache.airavata.gsi.ssh.impl.PBSCluster; import org.apache.airavata.gsi.ssh.util.CommonUtils; import org.apache.airavata.model.appcatalog.appinterface.InputDataObjectType; import org.apache.airavata.model.appcatalog.computeresource.*; +import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference; import org.apache.airavata.model.workspace.experiment.ComputationalResourceScheduling; import org.apache.airavata.model.workspace.experiment.CorrectiveAction; import org.apache.airavata.model.workspace.experiment.ErrorCategory; @@ -232,6 +233,16 @@ public class GFACSSHUtils { .getApplicationDeploymentDescription().getExecutablePath()); jobDescriptor.setStandardOutFile(jobExecutionContext.getStandardOutput()); jobDescriptor.setStandardErrorFile(jobExecutionContext.getStandardError()); + String computationalProjectAccount = taskData.getTaskScheduling().getComputationalProjectAccount(); + if (computationalProjectAccount == null){ + ComputeResourcePreference computeResourcePreference = jobExecutionContext.getApplicationContext().getComputeResourcePreference(); + if (computeResourcePreference != null) { + computationalProjectAccount = computeResourcePreference.getAllocationProjectNumber(); + } + } + if (computationalProjectAccount != null) { + jobDescriptor.setAcountString(computationalProjectAccount); + } Random random = new Random(); int i = random.nextInt(Integer.MAX_VALUE); jobDescriptor.setJobName(String.valueOf(i + 99999999));
