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/05/27 20:18:40 UTC
[1/2] git commit: Added check if the host and appliation name is not
set in registry.
Repository: airavata
Updated Branches:
refs/heads/master 4b51e7f6a -> b3f7b256f
Added check if the host and appliation name is not set in registry.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/92ddf3e4
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/92ddf3e4
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/92ddf3e4
Branch: refs/heads/master
Commit: 92ddf3e4e1b385da67a9503a0ae88ac95933c445
Parents: d918468
Author: raminder <ra...@apache.org>
Authored: Tue May 27 14:18:01 2014 -0400
Committer: raminder <ra...@apache.org>
Committed: Tue May 27 14:18:01 2014 -0400
----------------------------------------------------------------------
.../main/java/org/apache/airavata/gfac/core/cpi/GFacImpl.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/92ddf3e4/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/GFacImpl.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/GFacImpl.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/GFacImpl.java
index bdc498f..e5f1864 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/GFacImpl.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/cpi/GFacImpl.java
@@ -212,7 +212,7 @@ public class GFacImpl implements GFac {
// 2. Add another property to jobExecutionContext and read them inside the provider and use it.
String serviceName = taskData.getApplicationId();
if (serviceName == null) {
- throw new GFacException("Error executing the job because there is not Application Name in this Experiment");
+ throw new GFacException("Error executing the job because there is not Application Name in this Experiment: " + serviceName);
}
ServiceDescription serviceDescription = airavataRegistry2.getServiceDescriptor(serviceName);
@@ -232,7 +232,9 @@ public class GFacImpl implements GFac {
hostDescription = hostScheduler.schedule(registeredHosts);
hostName = hostDescription.getType().getHostName();
}
-
+ if(hostDescription == null){
+ throw new GFacException("Error executing the job as the host is not registered " + hostName);
+ }
ApplicationDescription applicationDescription = airavataRegistry2.getApplicationDescriptors(serviceName, hostName);
URL resource = GFacImpl.class.getClassLoader().getResource(org.apache.airavata.common.utils.Constants.GFAC_CONFIG_XML);
Properties configurationProperties = ServerSettings.getProperties();
[2/2] 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/b3f7b256
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b3f7b256
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b3f7b256
Branch: refs/heads/master
Commit: b3f7b256f731c17f067a1c74841932d63a405eea
Parents: 92ddf3e 4b51e7f
Author: raminder <ra...@apache.org>
Authored: Tue May 27 14:18:24 2014 -0400
Committer: raminder <ra...@apache.org>
Committed: Tue May 27 14:18:24 2014 -0400
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 8 +-
.../resources/lib/experimentModel_types.cpp | 24 +++-
.../main/resources/lib/experimentModel_types.h | 19 ++-
.../Model/Workspace/Experiment/Types.php | 28 +++-
.../client/samples/CreateLaunchExperiment.java | 2 +-
.../workspace/experiment/ExperimentSummary.java | 129 +++++++++++++++++--
.../experimentModel.thrift | 5 +-
.../main/resources/airavata-server.properties | 7 +-
modules/distribution/server/pom.xml | 5 +
.../server/src/main/assembly/bin-assembly.xml | 1 +
.../airavata/gfac/server/GfacServerHandler.java | 34 +++--
.../AiravataExperimentStatusUpdator.java | 1 +
.../AiravataWorkflowNodeStatusUpdator.java | 23 +---
.../gfac/local/provider/impl/LocalProvider.java | 7 -
.../src/test/resources/orchestrator.properties | 2 +-
modules/orchestrator/orchestrator-core/pom.xml | 23 ++--
.../orchestrator/core/gfac/GFACInstance.java | 7 +-
.../core/gfac/GFacClientFactory.java | 42 ++++++
.../core/impl/EmbeddedGFACJobSubmitter.java | 83 ------------
.../core/impl/GFACEmbeddedJobSubmitter.java | 81 ++++++++++++
.../core/impl/GFACServiceJobSubmitter.java | 63 +++++++++
.../core/utils/OrchestratorUtils.java | 4 +-
.../cpi/impl/SimpleOrchestratorImpl.java | 1 -
.../registry/jpa/resources/WorkerResource.java | 6 +-
.../jpa/utils/ThriftDataModelConversion.java | 1 +
25 files changed, 427 insertions(+), 179 deletions(-)
----------------------------------------------------------------------