You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2015/05/11 16:23:54 UTC
airavata git commit: keeping only the passive mode from orchestrator
Repository: airavata
Updated Branches:
refs/heads/master e4be39e81 -> 7b8e933a4
keeping only the passive mode from orchestrator
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7b8e933a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7b8e933a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7b8e933a
Branch: refs/heads/master
Commit: 7b8e933a40c3dcafedcd13291d9abb1135177404
Parents: e4be39e
Author: Chathuri Wimalasena <ch...@apache.org>
Authored: Mon May 11 10:23:47 2015 -0400
Committer: Chathuri Wimalasena <ch...@apache.org>
Committed: Mon May 11 10:23:47 2015 -0400
----------------------------------------------------------------------
.../client/samples/CreateLaunchExperiment.java | 14 +++++++++++---
.../src/main/resources/airavata-server.properties | 2 +-
.../server/OrchestratorServerHandler.java | 1 -
.../core/utils/OrchestratorConstants.java | 1 -
.../orchestrator/core/utils/OrchestratorUtils.java | 1 -
.../orchestrator/cpi/impl/SimpleOrchestratorImpl.java | 6 +++---
.../src/main/resources/test-framework.json | 4 ++--
pom.xml | 2 +-
8 files changed, 18 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7b8e933a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
index 1aa16f5..ed85238 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
@@ -43,13 +43,15 @@ import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.*;
public class CreateLaunchExperiment {
//FIXME: Read from a config file
- public static final String THRIFT_SERVER_HOST = "localhost";
- public static final int THRIFT_SERVER_PORT = 8930;
+ public static final String THRIFT_SERVER_HOST = "gw111.iu.xsede.org";
+ public static final int THRIFT_SERVER_PORT = 9930;
// public static final String THRIFT_SERVER_HOST = "gw111.iu.xsede.org";
// public static final int THRIFT_SERVER_PORT = 9930;
@@ -85,10 +87,16 @@ public class CreateLaunchExperiment {
public static void main(String[] args) throws Exception {
airavataClient = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
System.out.println("API version is " + airavataClient.getAPIVersion());
+ Experiment experiment = airavataClient.getExperiment("echotest_fcc7127d-73e9-4e43-bc07-07399a7c5efc");
+ long creationTime = experiment.getCreationTime();
+ Date date = new Date(creationTime);
+ DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String dateFormatted = formatter.format(date);
+ System.out.println(dateFormatted);
// createGateway();
// getGateway("testGatewayId");
// registerApplications(); // run this only the first time
- createAndLaunchExp();
+// createAndLaunchExp();
}
private static String fsdResourceId;
http://git-wip-us.apache.org/repos/asf/airavata/blob/7b8e933a/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 2df1531..c5d6a3f 100644
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@ -245,7 +245,7 @@ rabbitmq.exchange.name=airavata_rabbitmq_exchange
###########################################################################
#job.submitter=org.apache.airavata.orchestrator.core.impl.GFACEmbeddedJobSubmitter
-job.submitter=org.apache.airavata.orchestrator.core.impl.GFACPassiveJobSubmitter
+#job.submitter=org.apache.airavata.orchestrator.core.impl.GFACPassiveJobSubmitter
#job.submitter=org.apache.airavata.orchestrator.core.impl.GFACRPCJobSubmitter
job.validators=org.apache.airavata.orchestrator.core.validator.impl.BatchQueueValidator,org.apache.airavata.orchestrator.core.validator.impl.ExperimentStatusValidator
submitter.interval=10000
http://git-wip-us.apache.org/repos/asf/airavata/blob/7b8e933a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
index 18443c1..ff6eab1 100644
--- a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
+++ b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java
@@ -117,7 +117,6 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface,
* Query orchestrator server to fetch the CPI version
*/
public String getOrchestratorCPIVersion() throws TException {
-
return orchestrator_cpi_serviceConstants.ORCHESTRATOR_CPI_VERSION;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/7b8e933a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorConstants.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorConstants.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorConstants.java
index 97b85bc..1eadfa9 100644
--- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorConstants.java
+++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorConstants.java
@@ -27,7 +27,6 @@ package org.apache.airavata.orchestrator.core.utils;
public class OrchestratorConstants {
public static final String AIRAVATA_PROPERTIES = "airavata-server.properties";
public static final int hotUpdateInterval=1000;
- public static final String JOB_SUBMITTER = "job.submitter";
public static final String SUBMIT_INTERVAL = "submitter.interval";
public static final String THREAD_POOL_SIZE = "threadpool.size";
public static final String START_SUBMITTER = "start.submitter";
http://git-wip-us.apache.org/repos/asf/airavata/blob/7b8e933a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java
index 021e2eb..2f88c81 100644
--- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java
+++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/utils/OrchestratorUtils.java
@@ -38,7 +38,6 @@ public class OrchestratorUtils {
public static OrchestratorConfiguration loadOrchestratorConfiguration() throws OrchestratorException, IOException, NumberFormatException, ApplicationSettingsException {
OrchestratorConfiguration orchestratorConfiguration = new OrchestratorConfiguration();
- orchestratorConfiguration.setNewJobSubmitterClass((String) ServerSettings.getSetting(OrchestratorConstants.JOB_SUBMITTER));
orchestratorConfiguration.setSubmitterInterval(Integer.parseInt((String) ServerSettings.getSetting(OrchestratorConstants.SUBMIT_INTERVAL)));
orchestratorConfiguration.setThreadPoolSize(Integer.parseInt((String) ServerSettings.getSetting(OrchestratorConstants.THREAD_POOL_SIZE)));
orchestratorConfiguration.setStartSubmitter(Boolean.valueOf(ServerSettings.getSetting(OrchestratorConstants.START_SUBMITTER)));
http://git-wip-us.apache.org/repos/asf/airavata/blob/7b8e933a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
index af76591..66ae987 100644
--- a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
+++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
@@ -26,6 +26,7 @@ import org.apache.airavata.model.error.ValidatorResult;
import org.apache.airavata.model.util.ExperimentModelUtil;
import org.apache.airavata.model.workspace.experiment.*;
import org.apache.airavata.orchestrator.core.exception.OrchestratorException;
+import org.apache.airavata.orchestrator.core.impl.GFACPassiveJobSubmitter;
import org.apache.airavata.orchestrator.core.job.JobSubmitter;
import org.apache.airavata.orchestrator.core.validator.JobMetadataValidator;
import org.apache.airavata.registry.cpi.ChildDataType;
@@ -51,9 +52,8 @@ public class SimpleOrchestratorImpl extends AbstractOrchestrator{
public SimpleOrchestratorImpl() throws OrchestratorException {
try {
try {
- String submitterClass = this.orchestratorContext.getOrchestratorConfiguration().getNewJobSubmitterClass();
- Class<? extends JobSubmitter> aClass = Class.forName(submitterClass.trim()).asSubclass(JobSubmitter.class);
- jobSubmitter = aClass.newInstance();
+ // We are only going to use GFacPassiveJobSubmitter
+ jobSubmitter = new GFACPassiveJobSubmitter();
jobSubmitter.initialize(this.orchestratorContext);
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/7b8e933a/modules/test-suite/multi-tenanted-airavata/src/main/resources/test-framework.json
----------------------------------------------------------------------
diff --git a/modules/test-suite/multi-tenanted-airavata/src/main/resources/test-framework.json b/modules/test-suite/multi-tenanted-airavata/src/main/resources/test-framework.json
index f25b091..4a987bf 100644
--- a/modules/test-suite/multi-tenanted-airavata/src/main/resources/test-framework.json
+++ b/modules/test-suite/multi-tenanted-airavata/src/main/resources/test-framework.json
@@ -10,7 +10,7 @@
"sshUsername": "ogce",
"tokenFileLoc": "/tmp/",
"resultFileLoc": "/tmp/test_framework_results/",
- "skippedGateways": "default,php_reference_gateway,ultrascan,umass",
+ "skippedGateways": "default,php_reference_gateway,umass",
"injectErrors" : true,
"numberOfIterations" : 10,
"resources": [
@@ -52,7 +52,7 @@
{
"name": "Ultrascan",
"inputs": {
- "input": "/Users/chathuri/dev/airavata/source/php/inputs/hpcinput.tar",
+ "input": "file://chathuri@149.160.168.148:/Users/chathuri/dev/airavata/source/php/inputs/hpcinput.tar",
"mgroupcount": "-mgroupcount=1",
"walltime": "-walltime=60"
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/7b8e933a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9ddf5a8..32a5e69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -532,7 +532,7 @@
<module>modules/test-suite</module>
<module>modules/distribution</module>
<module>modules/messaging</module>
- <!--<module>modules/integration-tests</module>-->
+ <module>modules/integration-tests</module>
<module>modules/workflow</module>
<module>modules/xbaya-gui</module>
</modules>