You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ra...@apache.org on 2014/03/12 21:13:52 UTC
[1/3] git commit: updated the input/output directory name for
ultrascan. Fixed the Launch experiment.
Repository: airavata
Updated Branches:
refs/heads/master 705dc5998 -> 0b6de0611
updated the input/output directory name for ultrascan. Fixed the Launch
experiment.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/53977e33
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/53977e33
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/53977e33
Branch: refs/heads/master
Commit: 53977e33c6c55b3a85120a74802fd768fef9a38a
Parents: 8c6f9b5
Author: raminder <ra...@apache.org>
Authored: Wed Mar 12 15:24:20 2014 -0400
Committer: raminder <ra...@apache.org>
Committed: Wed Mar 12 15:24:20 2014 -0400
----------------------------------------------------------------------
.../samples/CreateLaunchExperimentUS3.java | 24 ++++++++++----------
.../gfac/handler/AppDescriptorCheckHandler.java | 6 ++---
2 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/53977e33/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
index 8834f5a..41601d1 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperimentUS3.java
@@ -76,7 +76,7 @@ public class CreateLaunchExperimentUS3 {
}
}
}
- Thread.sleep(5000);
+ Thread.sleep(20000);
} catch (Exception e) {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
@@ -100,9 +100,9 @@ public class CreateLaunchExperimentUS3 {
public static void addDescriptors() throws AiravataAPIInvocationException,ApplicationSettingsException {
try {
UltrascanDocumentCreator documentCreator = new UltrascanDocumentCreator(getAiravataAPI());
-// documentCreator.createMPIPBSDocsTrestles();
-// documentCreator.createEchoPBSDocsforTestles();
-// documentCreator.createEchoSlurmDocsofStampede();
+ documentCreator.createMPIPBSDocsTrestles();
+ documentCreator.createEchoPBSDocsforTestles();
+ documentCreator.createEchoSlurmDocsofStampede();
documentCreator.createMPISLURMDocsStampede();
} catch (AiravataAPIInvocationException e) {
logger.error("Unable to create airavata API", e.getMessage());
@@ -146,10 +146,10 @@ public class CreateLaunchExperimentUS3 {
exOut.add(output);
Experiment simpleExperiment =
- ExperimentModelUtil.createSimpleExperiment("project1", "admin", "echoExperiment", "SimpleEcho2", "SimpleEcho2", exInputs);
+ ExperimentModelUtil.createSimpleExperiment("project1", "admin", "US3EchoExperimentTrestles", "US3EchoTrestles", "US3EchoTrestles", exInputs);
simpleExperiment.setExperimentOutputs(exOut);
- ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling("trestles.sdsc.edu", 1, 1, 1, "normal", 0, 0, 1, "sds128");
+ ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling("trestles.sdsc.edu", 1, 1, 1, "shared", 0, 0, 1, "sds128");
scheduling.setResourceHostId("gsissh-trestles");
UserConfigurationData userConfigurationData = new UserConfigurationData();
userConfigurationData.setAiravataAutoSchedule(false);
@@ -199,10 +199,10 @@ public class CreateLaunchExperimentUS3 {
exOut.add(output2);
- Experiment simpleExperiment = ExperimentModelUtil.createSimpleExperiment("project1", "admin", "US3Experiment", "UltrascanAppTrestles", "UltrascanAppTrestles", exInputs);
+ Experiment simpleExperiment = ExperimentModelUtil.createSimpleExperiment("project1", "admin", "US3ExperimentTrestles", "US3AppTrestles", "US3AppTrestles", exInputs);
simpleExperiment.setExperimentOutputs(exOut);
- ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling("trestles.sdsc.edu", 2, 32, 0, "normal", 0, 0, 0, "uot111");
+ ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling("trestles.sdsc.edu", 2, 32, 0, "shared", 0, 0, 0, "uot111");
scheduling.setResourceHostId("gsissh-trestles");
@@ -256,7 +256,7 @@ public class CreateLaunchExperimentUS3 {
Experiment simpleExperiment = ExperimentModelUtil.createSimpleExperiment("project1", "admin", "US3ExperimentStampede", "US3AppStampede", "US3AppStampede", exInputs);
simpleExperiment.setExperimentOutputs(exOut);
- ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling("stampede.tacc.xsede.org", 2, 32, 0, "normal", 0, 0, 0, "TG-MCB070039N");
+ ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling("stampede.tacc.xsede.org", 2, 32, 0, "development", 0, 0, 0, "TG-MCB070039N");
scheduling.setResourceHostId("gsissh-stampede");
@@ -297,12 +297,12 @@ public class CreateLaunchExperimentUS3 {
exOut.add(output);
Experiment simpleExperiment =
- ExperimentModelUtil.createSimpleExperiment("project1", "admin", "echoExperiment", "SimpleEcho3", "SimpleEcho3", exInputs);
+ ExperimentModelUtil.createSimpleExperiment("project1", "admin", "US3EchoExperimentStatus", "US3EchoStampede", "US3EchoStampede", exInputs);
simpleExperiment.setExperimentOutputs(exOut);
ComputationalResourceScheduling scheduling =
- ExperimentModelUtil.createComputationResourceScheduling("stampede.tacc.xsede.org", 1, 1, 1, "normal", 0, 0, 1, "TG-STA110014S");
- scheduling.setResourceHostId("stampede-host");
+ ExperimentModelUtil.createComputationResourceScheduling("stampede.tacc.xsede.org", 1, 1, 1, "development", 0, 0, 1, "TG-MCB070039N");
+ scheduling.setResourceHostId("gsissh-stampede");
UserConfigurationData userConfigurationData = new UserConfigurationData();
userConfigurationData.setAiravataAutoSchedule(false);
userConfigurationData.setOverrideManualScheduledParams(false);
http://git-wip-us.apache.org/repos/asf/airavata/blob/53977e33/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AppDescriptorCheckHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AppDescriptorCheckHandler.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AppDescriptorCheckHandler.java
index 62ad1f0..a3592f8 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AppDescriptorCheckHandler.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AppDescriptorCheckHandler.java
@@ -56,15 +56,15 @@ public class AppDescriptorCheckHandler implements GFacHandler {
appDesc.setStaticWorkingDirectory(tmpDir);
}
-
+ //FIXME: Move this input/output to application descriptor
/*
* Input and Output Directory
*/
if (appDesc.getInputDataDirectory() == null || "".equals(appDesc.getInputDataDirectory())) {
- appDesc.setInputDataDirectory(appDesc.getStaticWorkingDirectory() + File.separator + "inputData");
+ appDesc.setInputDataDirectory(appDesc.getStaticWorkingDirectory() + File.separator + "input");
}
if (appDesc.getOutputDataDirectory() == null || "".equals(appDesc.getOutputDataDirectory())) {
- appDesc.setOutputDataDirectory(appDesc.getStaticWorkingDirectory() + File.separator + "outputData");
+ appDesc.setOutputDataDirectory(appDesc.getStaticWorkingDirectory() + File.separator + "output");
}
/*
[3/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by ra...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/0b6de061
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0b6de061
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0b6de061
Branch: refs/heads/master
Commit: 0b6de0611dc3435ef710038d0afbf0e6f937d570
Parents: 89ac4f9 705dc59
Author: raminder <ra...@apache.org>
Authored: Wed Mar 12 16:13:45 2014 -0400
Committer: raminder <ra...@apache.org>
Committed: Wed Mar 12 16:13:45 2014 -0400
----------------------------------------------------------------------
.../airavata-php-sdk/README | 5 +
.../lib/Airavata/API/Airavata.php | 4849 ++++++++++++++++++
.../lib/Airavata/API/Error/Types.php | 583 +++
.../airavata-php-sdk/lib/Airavata/API/Types.php | 22 +
.../lib/Airavata/Model/Types.php | 20 +
.../Model/Workspace/Experiment/Types.php | 3670 +++++++++++++
.../lib/Airavata/Model/Workspace/Types.php | 568 ++
.../airavata-php-sdk/lib/Thrift/Base/TBase.php | 367 ++
.../Thrift/ClassLoader/ThriftClassLoader.php | 223 +
.../Thrift/Exception/TApplicationException.php | 72 +
.../lib/Thrift/Exception/TException.php | 369 ++
.../lib/Thrift/Exception/TProtocolException.php | 48 +
.../Thrift/Exception/TTransportException.php | 41 +
.../Thrift/Factory/TBinaryProtocolFactory.php | 43 +
.../Thrift/Factory/TCompactProtocolFactory.php | 39 +
.../lib/Thrift/Factory/TJSONProtocolFactory.php | 41 +
.../lib/Thrift/Factory/TProtocolFactory.php | 35 +
.../lib/Thrift/Factory/TStringFuncFactory.php | 63 +
.../lib/Thrift/Factory/TTransportFactory.php | 16 +
.../lib/Thrift/Protocol/JSON/BaseContext.php | 39 +
.../lib/Thrift/Protocol/JSON/ListContext.php | 52 +
.../Thrift/Protocol/JSON/LookaheadReader.php | 54 +
.../lib/Thrift/Protocol/JSON/PairContext.php | 60 +
.../lib/Thrift/Protocol/TBinaryProtocol.php | 396 ++
.../Protocol/TBinaryProtocolAccelerated.php | 47 +
.../lib/Thrift/Protocol/TCompactProtocol.php | 669 +++
.../lib/Thrift/Protocol/TJSONProtocol.php | 694 +++
.../lib/Thrift/Protocol/TProtocol.php | 340 ++
.../lib/Thrift/Serializer/TBinarySerializer.php | 73 +
.../lib/Thrift/Server/TForkingServer.php | 119 +
.../lib/Thrift/Server/TServer.php | 101 +
.../lib/Thrift/Server/TServerSocket.php | 98 +
.../lib/Thrift/Server/TServerTransport.php | 54 +
.../lib/Thrift/Server/TSimpleServer.php | 57 +
.../lib/Thrift/StringFunc/Core.php | 38 +
.../lib/Thrift/StringFunc/Mbstring.php | 45 +
.../lib/Thrift/StringFunc/TStringFunc.php | 27 +
.../lib/Thrift/Transport/TBufferedTransport.php | 165 +
.../lib/Thrift/Transport/TFramedTransport.php | 183 +
.../lib/Thrift/Transport/THttpClient.php | 221 +
.../lib/Thrift/Transport/TMemoryBuffer.php | 89 +
.../lib/Thrift/Transport/TNullTransport.php | 50 +
.../lib/Thrift/Transport/TPhpStream.php | 114 +
.../lib/Thrift/Transport/TSocket.php | 326 ++
.../lib/Thrift/Transport/TSocketPool.php | 295 ++
.../lib/Thrift/Transport/TTransport.php | 93 +
.../lib/Thrift/Type/TMessageType.php | 33 +
.../airavata-php-sdk/lib/Thrift/Type/TType.php | 46 +
airavata-api/generate-thrift-files.sh | 24 +-
.../apache/airavata/job/monitor/MonitorID.java | 6 +
.../airavata/job/monitor/MonitorManager.java | 1 +
.../monitor/impl/pull/qstat/QstatMonitor.java | 2 +-
.../impl/pull/qstat/ResourceConnection.java | 6 +-
.../impl/push/amqp/JSONMessageParser.java | 7 +-
.../org/apache/airavata/gfac/cpi/GFacImpl.java | 14 +
.../airavata/gfac/handler/SCPOutputHandler.java | 23 +-
.../gfac/provider/impl/GSISSHProvider.java | 2 +-
.../registry/jpa/impl/ExperimentRegistry.java | 3 +
.../AdvanceInputDataHandlingResource.java | 8 +-
.../AdvancedOutputDataHandlingResource.java | 9 +-
60 files changed, 15735 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: updated the direcotry location. AIRAVATA-1076
Posted by ra...@apache.org.
updated the direcotry location. AIRAVATA-1076
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/89ac4f93
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/89ac4f93
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/89ac4f93
Branch: refs/heads/master
Commit: 89ac4f93df8c22f54baac8529723d2702f2fa622
Parents: 53977e3
Author: raminder <ra...@apache.org>
Authored: Wed Mar 12 16:12:54 2014 -0400
Committer: raminder <ra...@apache.org>
Committed: Wed Mar 12 16:12:54 2014 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/airavata/gfac/Constants.java | 4 ++--
.../airavata/gfac/handler/AppDescriptorCheckHandler.java | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/89ac4f93/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 b0e17c0..5f1af68 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
@@ -39,8 +39,8 @@ public class Constants {
public static final String GFAC_CONFIG_CLASS_ATTRIBUTE = "class";
public static final String GFAC_CONFIG_APPLICATION_NAME_ATTRIBUTE = "class";
public static final String NEWLINE = System.getProperty("line.separator");
- public static final String INPUT_DATA_DIR_VAR_NAME = "inputData";
- public static final String OUTPUT_DATA_DIR_VAR_NAME = "outputData";
+ public static final String INPUT_DATA_DIR_VAR_NAME = "input";
+ public static final String OUTPUT_DATA_DIR_VAR_NAME = "output";
public static final int DEFAULT_GSI_FTP_PORT = 2811;
public static final String _127_0_0_1 = "127.0.0.1";
public static final String LOCALHOST = "localhost";
http://git-wip-us.apache.org/repos/asf/airavata/blob/89ac4f93/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AppDescriptorCheckHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AppDescriptorCheckHandler.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AppDescriptorCheckHandler.java
index a3592f8..9afa92f 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AppDescriptorCheckHandler.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/handler/AppDescriptorCheckHandler.java
@@ -21,6 +21,7 @@
package org.apache.airavata.gfac.handler;
import org.apache.airavata.commons.gfac.type.ApplicationDescription;
+import org.apache.airavata.gfac.Constants;
import org.apache.airavata.gfac.GFacException;
import org.apache.airavata.gfac.context.JobExecutionContext;
import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
@@ -56,15 +57,15 @@ public class AppDescriptorCheckHandler implements GFacHandler {
appDesc.setStaticWorkingDirectory(tmpDir);
}
- //FIXME: Move this input/output to application descriptor
+ //FIXME: Move this input/output to application descrpitor
/*
* Input and Output Directory
*/
if (appDesc.getInputDataDirectory() == null || "".equals(appDesc.getInputDataDirectory())) {
- appDesc.setInputDataDirectory(appDesc.getStaticWorkingDirectory() + File.separator + "input");
+ appDesc.setInputDataDirectory(appDesc.getStaticWorkingDirectory() + File.separator + Constants.INPUT_DATA_DIR_VAR_NAME);
}
if (appDesc.getOutputDataDirectory() == null || "".equals(appDesc.getOutputDataDirectory())) {
- appDesc.setOutputDataDirectory(appDesc.getStaticWorkingDirectory() + File.separator + "output");
+ appDesc.setOutputDataDirectory(appDesc.getStaticWorkingDirectory() + File.separator + Constants.OUTPUT_DATA_DIR_VAR_NAME);
}
/*