You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2015/10/08 12:11:52 UTC
[1/2] airavata git commit: fixing static-working-dir not storing issue
Repository: airavata
Updated Branches:
refs/heads/master 1b6dffe9f -> 51ed55072
fixing static-working-dir not storing issue
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/302a58e6
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/302a58e6
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/302a58e6
Branch: refs/heads/master
Commit: 302a58e6e1675cbc92af5e732c9a0e28b930c13f
Parents: ae20875
Author: scnakandala <su...@gmail.com>
Authored: Thu Oct 8 06:11:27 2015 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Oct 8 06:11:27 2015 -0400
----------------------------------------------------------------------
.../registry/core/experiment/catalog/impl/ExperimentRegistry.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/302a58e6/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
index 990fe8d..077b8e1 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/impl/ExperimentRegistry.java
@@ -144,6 +144,7 @@ public class ExperimentRegistry {
configDataResource.setQueueName(configurationData.getComputationalResourceScheduling().getQueueName());
configDataResource.setWallTimeLimit(configurationData.getComputationalResourceScheduling().getWallTimeLimit());
configDataResource.setTotalPhysicalMemory(configurationData.getComputationalResourceScheduling().getTotalPhysicalMemory());
+ configDataResource.setStaticWorkingDir(configurationData.getComputationalResourceScheduling().getStaticWorkingDir());
configDataResource.save();
} catch (Exception e) {
logger.error("Unable to save user config data", e);
@@ -693,6 +694,7 @@ public class ExperimentRegistry {
configDataResource.setQueueName(configurationData.getComputationalResourceScheduling().getQueueName());
configDataResource.setWallTimeLimit(configurationData.getComputationalResourceScheduling().getWallTimeLimit());
configDataResource.setTotalPhysicalMemory(configurationData.getComputationalResourceScheduling().getTotalPhysicalMemory());
+ configDataResource.setStaticWorkingDir(configurationData.getComputationalResourceScheduling().getStaticWorkingDir());
configDataResource.save();
} catch (Exception e) {
logger.error("Unable to save user config data", e);
@@ -963,6 +965,7 @@ public class ExperimentRegistry {
configDataResource.setQueueName(value.getQueueName());
configDataResource.setWallTimeLimit(value.getWallTimeLimit());
configDataResource.setTotalPhysicalMemory(value.getTotalPhysicalMemory());
+ configDataResource.setStaticWorkingDir(value.getStaticWorkingDir());
configDataResource.save();
}
[2/2] airavata git commit: Merge remote-tracking branch
'origin/master'
Posted by sc...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/51ed5507
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/51ed5507
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/51ed5507
Branch: refs/heads/master
Commit: 51ed550725013cd8a27dd9533fac1a96f6baaf80
Parents: 302a58e 1b6dffe
Author: scnakandala <su...@gmail.com>
Authored: Thu Oct 8 06:11:49 2015 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Oct 8 06:11:49 2015 -0400
----------------------------------------------------------------------
.../gfac/core/cluster/RemoteCluster.java | 14 +-
.../org/apache/airavata/gfac/impl/Factory.java | 5 +-
.../airavata/gfac/impl/GFacEngineImpl.java | 14 +-
.../airavata/gfac/impl/HPCRemoteCluster.java | 23 +-
.../org/apache/airavata/gfac/impl/SSHUtils.java | 238 ++++++++++++-------
.../impl/task/AdvancedSCPDataStageTask.java | 61 ++---
6 files changed, 208 insertions(+), 147 deletions(-)
----------------------------------------------------------------------