airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject airavata git commit: custom output location
Date Thu, 18 Jun 2015 14:01:51 GMT
Repository: airavata
Updated Branches:
  refs/heads/airavata-0.15-release-branch 2b1e125c8 -> ed8f049f9


custom output location


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ed8f049f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ed8f049f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ed8f049f

Branch: refs/heads/airavata-0.15-release-branch
Commit: ed8f049f919666b10efe7b5c61b5fb28c5685e48
Parents: 2b1e125
Author: Chathuri Wimalasena <chathuri@apache.org>
Authored: Thu Jun 18 10:01:37 2015 -0400
Committer: Chathuri Wimalasena <chathuri@apache.org>
Committed: Thu Jun 18 10:01:37 2015 -0400

----------------------------------------------------------------------
 .../server/src/main/resources/airavata-server.properties      | 1 +
 .../src/main/java/org/apache/airavata/gfac/Constants.java     | 2 ++
 .../apache/airavata/gfac/monitor/email/EmailBasedMonitor.java | 1 +
 .../java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java | 7 ++++++-
 4 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/ed8f049f/modules/configuration/server/src/main/resources/airavata-server.properties
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/airavata-server.properties b/modules/configuration/server/src/main/resources/airavata-server.properties
index 56a8bd1..e617555 100644
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@ -48,6 +48,7 @@ default.registry.user=admin
 default.registry.password=admin
 default.registry.password.hash.method=SHA
 default.registry.gateway=php_reference_gateway
+output.location=/var/www/portal/experimentData/
 
 #ip=127.0.0.1
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/ed8f049f/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/Constants.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/Constants.java
b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/Constants.java
index 5811251..758406e 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/Constants.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/Constants.java
@@ -77,4 +77,6 @@ public class Constants {
     public static final String NAME = "name";
     public static final String VALUE = "value";
 
+    public static final String OUTPUT_DATA_DIR = "output.location";
+
 }

http://git-wip-us.apache.org/repos/asf/airavata/blob/ed8f049f/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java
b/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java
index 4959449..f6b48fe 100644
--- a/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java
+++ b/modules/gfac/gfac-monitor/gfac-email-monitor/src/main/java/org/apache/airavata/gfac/monitor/email/EmailBasedMonitor.java
@@ -162,6 +162,7 @@ public class EmailBasedMonitor implements Runnable{
                 return ResourceJobManagerType.PBS;
             case "SDSC Admin <slurm@comet-fe3.sdsc.edu>": // comet
             case "slurm@batch1.stampede.tacc.utexas.edu": // stampede
+            case "slurm user <slurm@tempest.dsc.soic.indiana.edu>": //tempest
                 return ResourceJobManagerType.SLURM;
 //            case "lsf":
 //                return ResourceJobManagerType.LSF;

http://git-wip-us.apache.org/repos/asf/airavata/blob/ed8f049f/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java
b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java
index 704528f..68ff279 100644
--- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java
+++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java
@@ -5,6 +5,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import org.apache.airavata.common.utils.ServerSettings;
+import org.apache.airavata.gfac.Constants;
 import org.apache.airavata.gfac.core.context.JobExecutionContext;
 import org.apache.airavata.gfac.core.handler.GFacHandlerException;
 import org.apache.airavata.gfac.core.utils.GFacUtils;
@@ -24,7 +26,10 @@ public class HandleOutputs {
 	public static List<OutputDataObjectType> handleOutputs(JobExecutionContext jobExecutionContext,
Cluster cluster) throws GFacHandlerException {
 		List<OutputDataObjectType> outputArray = new ArrayList<OutputDataObjectType>();
 		try {
-			String outputDataDir = File.separator + "tmp" + File.separator + jobExecutionContext.getExperimentID();
+            String outputDataDir = ServerSettings.getSetting(Constants.OUTPUT_DATA_DIR);
+            if (outputDataDir == null){
+                outputDataDir = File.separator + "tmp" + File.separator + jobExecutionContext.getExperimentID();
+            }
 			(new File(outputDataDir)).mkdirs();
 
 			List<OutputDataObjectType> outputs = jobExecutionContext.getTaskData().getApplicationOutputs();


Mime
View raw message