You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2016/03/03 19:15:12 UTC
[02/14] airavata git commit: adding correct username for gateway usage
adding correct username for gateway usage
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d9a10755
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d9a10755
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d9a10755
Branch: refs/heads/master
Commit: d9a1075599030001cd3b9df6b06840dc2b6c9eae
Parents: 91ef607
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Thu Feb 25 16:54:37 2016 -0500
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Thu Feb 25 16:54:37 2016 -0500
----------------------------------------------------------------------
.../apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/d9a10755/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java
index fd2af7f..975602f 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/DefaultJobSubmissionTask.java
@@ -160,7 +160,8 @@ public class DefaultJobSubmissionTask implements JobSubmissionTask {
String loadCommand = computeResourceDescription.getGatewayUsageModuleLoadCommand();
String usageExecutable = computeResourceDescription.getGatewayUsageExecutable();
ExperimentModel experiment = (ExperimentModel)taskContext.getParentProcessContext().getExperimentCatalog().get(ExperimentCatalogModelType.EXPERIMENT, experimentId);
- RawCommandInfo rawCommandInfo = new RawCommandInfo(loadCommand + " && " + usageExecutable + " -gateway_user " + experiment.getUserName() +
+ String username = experiment.getUserName() + "@" + taskContext.getParentProcessContext().getComputeResourcePreference().getUsageReportingGatewayId();
+ RawCommandInfo rawCommandInfo = new RawCommandInfo(loadCommand + " && " + usageExecutable + " -gateway_user " + username +
" -submit_time \"`date '+%F %T %:z'`\" -jobid " + jobId );
remoteCluster.execute(rawCommandInfo);
}