You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2014/05/20 21:46:03 UTC
[1/2] git commit: fixing AIRAVATA-1230
Repository: airavata
Updated Branches:
refs/heads/master dab61520e -> 2710f6e3a
fixing AIRAVATA-1230
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6bb880a9
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6bb880a9
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6bb880a9
Branch: refs/heads/master
Commit: 6bb880a90fa2aa508d17a9da547225a6e7c6610d
Parents: dab6152
Author: lahiru <la...@apache.org>
Authored: Tue May 20 15:14:01 2014 -0400
Committer: lahiru <la...@apache.org>
Committed: Tue May 20 15:14:01 2014 -0400
----------------------------------------------------------------------
.../client/samples/CreateLaunchExperiment.java | 6 ++---
.../main/resources/airavata-server.properties | 2 +-
.../apache/airavata/gfac/GFacConfiguration.java | 2 +-
.../core/handler/AppDescriptorCheckHandler.java | 4 ++--
.../airavata/gfac/core/handler/GFacHandler.java | 23 ++++++++++++++++++--
.../gfac/core/handler/GFacHandlerConfig.java | 9 ++++----
.../apache/airavata/job/TestGlobalHandler.java | 4 ++--
.../org/apache/airavata/job/TestInHandler.java | 4 ++--
.../org/apache/airavata/job/TestOutHandler.java | 4 ++--
.../airavata/job/TestThreadedHandler.java | 4 ++--
.../gram/handler/GramDirectorySetupHandler.java | 4 ++--
.../gfac/gram/handler/GridFTPInputHandler.java | 8 ++-----
.../gfac/gram/handler/GridFTPOutputHandler.java | 9 ++------
.../handler/GSISSHDirectorySetupHandler.java | 4 ++--
.../gfac/gsissh/handler/GSISSHInputHandler.java | 2 +-
.../gsissh/handler/GSISSHOutputHandler.java | 7 ++----
.../hadoop/handler/HDFSDataMovementHandler.java | 4 ++--
.../hadoop/handler/HadoopDeploymentHandler.java | 2 +-
.../handler/LocalDirectorySetupHandler.java | 4 ++--
.../handlers/GridPullMonitorHandler.java | 4 ++--
.../ssh/handler/AdvancedSCPInputHandler.java | 16 +++++++-------
.../ssh/handler/AdvancedSCPOutputHandler.java | 18 +++++++--------
.../ssh/handler/SSHDirectorySetupHandler.java | 4 ++--
.../gfac/ssh/handler/SSHInputHandler.java | 8 ++-----
.../gfac/ssh/handler/SSHOutputHandler.java | 9 ++------
.../server/OrchestratorServerHandler.java | 14 +++++++++---
26 files changed, 93 insertions(+), 86 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/6bb880a9/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 927fa7f..225a45e 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
@@ -61,13 +61,13 @@ public class CreateLaunchExperiment {
AiravataUtils.setExecutionAsClient();
final Airavata.Client airavata = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT);
System.out.println("API version is " + airavata.GetAPIVersion());
- addDescriptors();
+// addDescriptors();
// final String expId = createExperimentForSSHHost(airavata);
// final String expId = createExperimentForSSHHost(airavata);
-// final String expId = createExperimentForTrestles(airavata);
+ final String expId = createExperimentForTrestles(airavata);
// final String expId = createExperimentForStampede(airavata);
- final String expId = createExperimentForLocalHost(airavata);
+// final String expId = createExperimentForLocalHost(airavata);
System.out.println("Experiment ID : " + expId);
updateExperiment(airavata, expId);
launchExperiment(airavata, expId);
http://git-wip-us.apache.org/repos/asf/airavata/blob/6bb880a9/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 4aefae8..5cd1b8e 100644
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@ -279,7 +279,7 @@ activity.listeners=org.apache.airavata.gfac.core.monitor.AiravataJobStatusUpdato
###---------------------------Orchestrator module Configurations---------------------------###
job.submitter=org.apache.airavata.orchestrator.core.impl.EmbeddedGFACJobSubmitter
-job.validators=org.apache.airavata.orchestrator.core.validator.impl.SimpleAppDataValidator
+job.validators=org.apache.airavata.orchestrator.core.validator.impl.SimpleAppDataValidator,org.apache.airavata.orchestrator.core.validator.impl.ExperimentStatusValidator
submitter.interval=10000
threadpool.size=10
start.submitter=true
http://git-wip-us.apache.org/repos/asf/airavata/blob/6bb880a9/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/GFacConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/GFacConfiguration.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/GFacConfiguration.java
index d110a11..f664bcc 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/GFacConfiguration.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/GFacConfiguration.java
@@ -187,7 +187,7 @@ public class GFacConfiguration {
NodeList nl = (NodeList) expr.evaluate(doc, XPathConstants.NODESET);
List<GFacHandlerConfig> gFacHandlerConfigs = new ArrayList<GFacHandlerConfig>();
- Map<String, String> properties = new HashMap<String, String>();
+ Properties properties = new Properties();
String className = "";
for (int i = 0; i < nl.getLength(); i++) {
className = ((Element) nl.item(i)).getAttribute(attribute);
http://git-wip-us.apache.org/repos/asf/airavata/blob/6bb880a9/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AppDescriptorCheckHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AppDescriptorCheckHandler.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AppDescriptorCheckHandler.java
index ce31acd..a49dccb 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AppDescriptorCheckHandler.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/AppDescriptorCheckHandler.java
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.util.Date;
-import java.util.Map;
+import java.util.Properties;
import java.util.UUID;
public class AppDescriptorCheckHandler implements GFacHandler {
@@ -81,7 +81,7 @@ public class AppDescriptorCheckHandler implements GFacHandler {
jobExecutionContext.getApplicationContext().setApplicationDeploymentDescription(app);
}
- public void initProperties(Map<String, String> properties) throws GFacHandlerException {
+ public void initProperties(Properties properties) throws GFacHandlerException {
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/6bb880a9/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/GFacHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/GFacHandler.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/GFacHandler.java
index 0719f61..f820e29 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/GFacHandler.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/GFacHandler.java
@@ -24,10 +24,29 @@ package org.apache.airavata.gfac.core.handler;
import org.apache.airavata.gfac.core.context.JobExecutionContext;
import java.util.Map;
+import java.util.Properties;
+/**
+ * This is the handler interface in gfac, most of the tasks
+ * which can be decoupled from each other can be implemented
+ * as a Handler. After implementing these can be registered in
+ * gfac-config.xml and those will get invoked by the framework.
+ */
public interface GFacHandler {
+ /**
+ * This can be used to initialize the Handler, This will get
+ * invoked after creating the handler instance using the default constructor
+ *
+ * @param properties
+ * @throws GFacHandlerException
+ */
+ public void initProperties(Properties properties) throws GFacHandlerException;
- public void initProperties(Map<String, String> properties) throws GFacHandlerException;
-
+ /**
+ * This is the method which will invoked by the frameworkd to exectute the
+ * Handler functionality.
+ * @param jobExecutionContext
+ * @throws GFacHandlerException
+ */
public void invoke(JobExecutionContext jobExecutionContext) throws GFacHandlerException;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/6bb880a9/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/GFacHandlerConfig.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/GFacHandlerConfig.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/GFacHandlerConfig.java
index d5fa418..ddb6341 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/GFacHandlerConfig.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/handler/GFacHandlerConfig.java
@@ -21,19 +21,20 @@
package org.apache.airavata.gfac.core.handler;
import java.util.Map;
+import java.util.Properties;
public class GFacHandlerConfig {
- public GFacHandlerConfig(Map<String, String> properties, String className) {
+ public GFacHandlerConfig(Properties properties, String className) {
this.properties = properties;
this.className = className;
}
- private Map<String,String> properties;
+ private Properties properties;
private String className;
- public void setProperties(Map<String, String> properties) {
+ public void setProperties(Properties properties) {
this.properties = properties;
}
@@ -41,7 +42,7 @@ public class GFacHandlerConfig {
this.className = className;
}
- public Map<String, String> getProperties() {
+ public Properties getProperties() {
return properties;
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/6bb880a9/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/TestGlobalHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/TestGlobalHandler.java b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/TestGlobalHandler.java
index b699b8f..05eb735 100644
--- a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/TestGlobalHandler.java
+++ b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/TestGlobalHandler.java
@@ -23,10 +23,10 @@ package org.apache.airavata.job;
import org.apache.airavata.gfac.core.handler.AbstractHandler;
import org.apache.airavata.gfac.core.handler.GFacHandlerException;
-import java.util.Map;
+import java.util.Properties;
public class TestGlobalHandler extends AbstractHandler {
- public void initProperties(Map<String, String> properties) throws GFacHandlerException {
+ public void initProperties(Properties properties) throws GFacHandlerException {
//To change body of implemented methods use File | Settings | File Templates.
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/6bb880a9/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/TestInHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/TestInHandler.java b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/TestInHandler.java
index bc6af11..e50bfd6 100644
--- a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/TestInHandler.java
+++ b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/TestInHandler.java
@@ -23,10 +23,10 @@ package org.apache.airavata.job;
import org.apache.airavata.gfac.core.handler.AbstractHandler;
import org.apache.airavata.gfac.core.handler.GFacHandlerException;
-import java.util.Map;
+import java.util.Properties;
public class TestInHandler extends AbstractHandler {
- public void initProperties(Map<String, String> properties) throws GFacHandlerException {
+ public void initProperties(Properties properties) throws GFacHandlerException {
//To change body of implemented methods use File | Settings | File Templates.
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/6bb880a9/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/TestOutHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/TestOutHandler.java b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/TestOutHandler.java
index db39ada..42dd00c 100644
--- a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/TestOutHandler.java
+++ b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/TestOutHandler.java
@@ -23,10 +23,10 @@ package org.apache.airavata.job;
import org.apache.airavata.gfac.core.handler.AbstractHandler;
import org.apache.airavata.gfac.core.handler.GFacHandlerException;
-import java.util.Map;
+import java.util.Properties;
public class TestOutHandler extends AbstractHandler {
- public void initProperties(Map<String, String> properties) throws GFacHandlerException {
+ public void initProperties(Properties properties) throws GFacHandlerException {
//To change body of implemented methods use File | Settings | File Templates.
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/6bb880a9/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/TestThreadedHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/TestThreadedHandler.java b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/TestThreadedHandler.java
index 09fd7e5..7ee54bd 100644
--- a/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/TestThreadedHandler.java
+++ b/modules/gfac/gfac-core/src/test/java/org/apache/airavata/job/TestThreadedHandler.java
@@ -24,12 +24,12 @@ import junit.framework.Assert;
import org.apache.airavata.gfac.core.handler.GFacHandlerException;
import org.apache.airavata.gfac.core.handler.ThreadedHandler;
-import java.util.Map;
+import java.util.Properties;
public class TestThreadedHandler extends ThreadedHandler {
- public void initProperties(Map<String, String> properties) throws GFacHandlerException {
+ public void initProperties(Properties properties) throws GFacHandlerException {
}
public void run() {
http://git-wip-us.apache.org/repos/asf/airavata/blob/6bb880a9/modules/gfac/gfac-gram/src/main/java/org/apache/airavata/gfac/gram/handler/GramDirectorySetupHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-gram/src/main/java/org/apache/airavata/gfac/gram/handler/GramDirectorySetupHandler.java b/modules/gfac/gfac-gram/src/main/java/org/apache/airavata/gfac/gram/handler/GramDirectorySetupHandler.java
index bd817db..f2ccb9a 100644
--- a/modules/gfac/gfac-gram/src/main/java/org/apache/airavata/gfac/gram/handler/GramDirectorySetupHandler.java
+++ b/modules/gfac/gfac-gram/src/main/java/org/apache/airavata/gfac/gram/handler/GramDirectorySetupHandler.java
@@ -22,7 +22,7 @@ package org.apache.airavata.gfac.gram.handler;
import java.net.URI;
import java.net.URISyntaxException;
-import java.util.Map;
+import java.util.Properties;
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.commons.gfac.type.ApplicationDescription;
@@ -133,7 +133,7 @@ public class GramDirectorySetupHandler extends AbstractHandler {
}
}
- public void initProperties(Map<String, String> properties) throws GFacHandlerException {
+ public void initProperties(Properties properties) throws GFacHandlerException {
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/6bb880a9/modules/gfac/gfac-gram/src/main/java/org/apache/airavata/gfac/gram/handler/GridFTPInputHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-gram/src/main/java/org/apache/airavata/gfac/gram/handler/GridFTPInputHandler.java b/modules/gfac/gfac-gram/src/main/java/org/apache/airavata/gfac/gram/handler/GridFTPInputHandler.java
index 0d87292..ae81357 100644
--- a/modules/gfac/gfac-gram/src/main/java/org/apache/airavata/gfac/gram/handler/GridFTPInputHandler.java
+++ b/modules/gfac/gfac-gram/src/main/java/org/apache/airavata/gfac/gram/handler/GridFTPInputHandler.java
@@ -26,11 +26,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.StringUtil;
@@ -199,7 +195,7 @@ public class GridFTPInputHandler extends AbstractHandler {
return destURI.getPath();
}
- public void initProperties(Map<String, String> properties) throws GFacHandlerException {
+ public void initProperties(Properties properties) throws GFacHandlerException {
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/6bb880a9/modules/gfac/gfac-gram/src/main/java/org/apache/airavata/gfac/gram/handler/GridFTPOutputHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-gram/src/main/java/org/apache/airavata/gfac/gram/handler/GridFTPOutputHandler.java b/modules/gfac/gfac-gram/src/main/java/org/apache/airavata/gfac/gram/handler/GridFTPOutputHandler.java
index 5f61335..2e1f9c9 100644
--- a/modules/gfac/gfac-gram/src/main/java/org/apache/airavata/gfac/gram/handler/GridFTPOutputHandler.java
+++ b/modules/gfac/gfac-gram/src/main/java/org/apache/airavata/gfac/gram/handler/GridFTPOutputHandler.java
@@ -28,12 +28,7 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.net.URI;
import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.StringUtil;
@@ -343,7 +338,7 @@ public class GridFTPOutputHandler extends AbstractHandler {
return outputFileStagingPath + File.separator + fileName;
}
- public void initProperties(Map<String, String> properties) throws GFacHandlerException {
+ public void initProperties(Properties properties) throws GFacHandlerException {
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/6bb880a9/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHDirectorySetupHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHDirectorySetupHandler.java b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHDirectorySetupHandler.java
index d447e69..7bbbc7e 100644
--- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHDirectorySetupHandler.java
+++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHDirectorySetupHandler.java
@@ -36,7 +36,7 @@ import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Map;
+import java.util.Properties;
public class GSISSHDirectorySetupHandler extends AbstractHandler {
private static final Logger log = LoggerFactory.getLogger(GSISSHDirectorySetupHandler.class);
@@ -97,7 +97,7 @@ public class GSISSHDirectorySetupHandler extends AbstractHandler {
}
}
- public void initProperties(Map<String, String> properties) throws GFacHandlerException {
+ public void initProperties(Properties properties) throws GFacHandlerException {
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/6bb880a9/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHInputHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHInputHandler.java b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHInputHandler.java
index da03a9b..6c08a59 100644
--- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHInputHandler.java
+++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHInputHandler.java
@@ -132,7 +132,7 @@ public class GSISSHInputHandler extends AbstractHandler {
}
}
- public void initProperties(Map<String, String> properties) throws GFacHandlerException {
+ public void initProperties(Properties properties) throws GFacHandlerException {
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/6bb880a9/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java
index c58810d..6bcee88 100644
--- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java
+++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/GSISSHOutputHandler.java
@@ -22,10 +22,7 @@ package org.apache.airavata.gfac.gsissh.handler;
import java.io.File;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import net.schmizz.sshj.connection.ConnectionException;
import net.schmizz.sshj.transport.TransportException;
@@ -220,7 +217,7 @@ public class GSISSHOutputHandler extends AbstractHandler {
}
- public void initProperties(Map<String, String> properties) throws GFacHandlerException {
+ public void initProperties(Properties properties) throws GFacHandlerException {
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/6bb880a9/modules/gfac/gfac-hadoop/src/main/java/org/apache/airavata/gfac/hadoop/handler/HDFSDataMovementHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-hadoop/src/main/java/org/apache/airavata/gfac/hadoop/handler/HDFSDataMovementHandler.java b/modules/gfac/gfac-hadoop/src/main/java/org/apache/airavata/gfac/hadoop/handler/HDFSDataMovementHandler.java
index 299be48..db75cb1 100644
--- a/modules/gfac/gfac-hadoop/src/main/java/org/apache/airavata/gfac/hadoop/handler/HDFSDataMovementHandler.java
+++ b/modules/gfac/gfac-hadoop/src/main/java/org/apache/airavata/gfac/hadoop/handler/HDFSDataMovementHandler.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
-import java.util.Map;
+import java.util.Properties;
public class HDFSDataMovementHandler implements GFacHandler {
private static final Logger logger = LoggerFactory.getLogger(HDFSDataMovementHandler.class);
@@ -97,7 +97,7 @@ public class HDFSDataMovementHandler implements GFacHandler {
private void handleOutPath(JobExecutionContext jobExecutionContext){}
- public void initProperties(Map<String, String> properties) throws GFacHandlerException {
+ public void initProperties(Properties properties) throws GFacHandlerException {
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/6bb880a9/modules/gfac/gfac-hadoop/src/main/java/org/apache/airavata/gfac/hadoop/handler/HadoopDeploymentHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-hadoop/src/main/java/org/apache/airavata/gfac/hadoop/handler/HadoopDeploymentHandler.java b/modules/gfac/gfac-hadoop/src/main/java/org/apache/airavata/gfac/hadoop/handler/HadoopDeploymentHandler.java
index 69c3087..1d49a84 100644
--- a/modules/gfac/gfac-hadoop/src/main/java/org/apache/airavata/gfac/hadoop/handler/HadoopDeploymentHandler.java
+++ b/modules/gfac/gfac-hadoop/src/main/java/org/apache/airavata/gfac/hadoop/handler/HadoopDeploymentHandler.java
@@ -270,7 +270,7 @@ public class HadoopDeploymentHandler implements GFacHandler {
return ((HadoopHostType)hostDescription.getType()).getHadoopConfigurationDirectory();
}
- public void initProperties(Map<String, String> properties) throws GFacHandlerException {
+ public void initProperties(Properties properties) throws GFacHandlerException {
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/6bb880a9/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/handler/LocalDirectorySetupHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/handler/LocalDirectorySetupHandler.java b/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/handler/LocalDirectorySetupHandler.java
index f145308..541990e 100644
--- a/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/handler/LocalDirectorySetupHandler.java
+++ b/modules/gfac/gfac-local/src/main/java/org/apache/airavata/gfac/local/handler/LocalDirectorySetupHandler.java
@@ -30,7 +30,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
-import java.util.Map;
+import java.util.Properties;
public class LocalDirectorySetupHandler implements GFacHandler {
private static final Logger log = LoggerFactory.getLogger(LocalDirectorySetupHandler.class);
@@ -57,7 +57,7 @@ public class LocalDirectorySetupHandler implements GFacHandler {
}
}
- public void initProperties(Map<String, String> properties) throws GFacHandlerException {
+ public void initProperties(Properties properties) throws GFacHandlerException {
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/6bb880a9/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/handlers/GridPullMonitorHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/handlers/GridPullMonitorHandler.java b/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/handlers/GridPullMonitorHandler.java
index 5e2b0a0..bb7d639 100644
--- a/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/handlers/GridPullMonitorHandler.java
+++ b/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/gfac/monitor/handlers/GridPullMonitorHandler.java
@@ -36,7 +36,7 @@ import org.apache.airavata.gsi.ssh.impl.authentication.MyProxyAuthenticationInfo
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Map;
+import java.util.Properties;
/**
* this handler is responsible for monitoring jobs in a pull mode
@@ -51,7 +51,7 @@ public class GridPullMonitorHandler extends ThreadedHandler {
private AuthenticationInfo authenticationInfo;
- public void initProperties(Map<String, String> properties) throws GFacHandlerException {
+ public void initProperties(Properties properties) throws GFacHandlerException {
String myProxyUser = null;
try {
myProxyUser = ServerSettings.getSetting("myproxy.username");
http://git-wip-us.apache.org/repos/asf/airavata/blob/6bb880a9/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPInputHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPInputHandler.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPInputHandler.java
index 19fc9ef..e102dd0 100644
--- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPInputHandler.java
+++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPInputHandler.java
@@ -75,14 +75,14 @@ public class AdvancedSCPInputHandler extends AbstractHandler {
private String inputPath;
- public void initProperties(Map<String, String> properties) throws GFacHandlerException {
- password = properties.get("password");
- passPhrase = properties.get("passPhrase");
- privateKeyPath = properties.get("privateKeyPath");
- publicKeyPath = properties.get("publicKeyPath");
- userName = properties.get("userName");
- hostName = properties.get("hostName");
- inputPath = properties.get("inputPath");
+ public void initProperties(Properties properties) throws GFacHandlerException {
+ password = (String)properties.get("password");
+ passPhrase = (String)properties.get("passPhrase");
+ privateKeyPath = (String)properties.get("privateKeyPath");
+ publicKeyPath = (String)properties.get("publicKeyPath");
+ userName = (String)properties.get("userName");
+ hostName = (String)properties.get("hostName");
+ inputPath = (String)properties.get("inputPath");
}
public void invoke(JobExecutionContext jobExecutionContext) throws GFacHandlerException {
http://git-wip-us.apache.org/repos/asf/airavata/blob/6bb880a9/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java
index 03e430b..1a8579d 100644
--- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java
+++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/AdvancedSCPOutputHandler.java
@@ -40,7 +40,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
-import java.util.Map;
+import java.util.Properties;
/**
* This handler will copy outputs from airavata installed local directory
@@ -73,14 +73,14 @@ public class AdvancedSCPOutputHandler extends AbstractHandler {
private String outputPath;
- public void initProperties(Map<String, String> properties) throws GFacHandlerException {
- password = properties.get("password");
- passPhrase = properties.get("passPhrase");
- privateKeyPath = properties.get("privateKeyPath");
- publicKeyPath = properties.get("publicKeyPath");
- userName = properties.get("userName");
- hostName = properties.get("hostName");
- outputPath = properties.get("outputPath");
+ public void initProperties(Properties properties) throws GFacHandlerException {
+ password = (String)properties.get("password");
+ passPhrase = (String)properties.get("passPhrase");
+ privateKeyPath = (String)properties.get("privateKeyPath");
+ publicKeyPath = (String)properties.get("publicKeyPath");
+ userName = (String)properties.get("userName");
+ hostName = (String)properties.get("hostName");
+ outputPath = (String)properties.get("outputPath");
}
@Override
http://git-wip-us.apache.org/repos/asf/airavata/blob/6bb880a9/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java
index abedc8f..b29f22b 100644
--- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java
+++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHDirectorySetupHandler.java
@@ -20,7 +20,7 @@
*/
package org.apache.airavata.gfac.ssh.handler;
-import java.util.Map;
+import java.util.Properties;
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.gfac.GFacException;
@@ -101,7 +101,7 @@ public class SSHDirectorySetupHandler extends AbstractHandler {
}
}
- public void initProperties(Map<String, String> properties) throws GFacHandlerException {
+ public void initProperties(Properties properties) throws GFacHandlerException {
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/6bb880a9/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHInputHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHInputHandler.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHInputHandler.java
index c2b7aa3..b237a81 100644
--- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHInputHandler.java
+++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHInputHandler.java
@@ -22,11 +22,7 @@ package org.apache.airavata.gfac.ssh.handler;
import java.io.File;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.StringUtil;
@@ -137,7 +133,7 @@ public class SSHInputHandler extends AbstractHandler {
}
}
- public void initProperties(Map<String, String> properties) throws GFacHandlerException {
+ public void initProperties(Properties properties) throws GFacHandlerException {
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/6bb880a9/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java
index 63ed192..90622b4 100644
--- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java
+++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/SSHOutputHandler.java
@@ -22,11 +22,7 @@ package org.apache.airavata.gfac.ssh.handler;
import java.io.File;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import net.schmizz.sshj.connection.ConnectionException;
import net.schmizz.sshj.transport.TransportException;
@@ -52,7 +48,6 @@ import org.apache.airavata.registry.cpi.RegistryModelType;
import org.apache.airavata.registry.cpi.RegistryException;
import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
import org.apache.airavata.schemas.gfac.GsisshHostType;
-import org.apache.airavata.schemas.gfac.URIParameterType;
import org.apache.xmlbeans.XmlException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -220,7 +215,7 @@ public class SSHOutputHandler extends AbstractHandler {
}
- public void initProperties(Map<String, String> properties) throws GFacHandlerException {
+ public void initProperties(Properties properties) throws GFacHandlerException {
}
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/6bb880a9/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 9c1f0c9..8f8325b 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
@@ -22,12 +22,11 @@
package org.apache.airavata.orchestrator.server;
import java.util.Arrays;
+import java.util.Calendar;
import java.util.List;
import org.apache.airavata.model.error.LaunchValidationException;
-import org.apache.airavata.model.workspace.experiment.Experiment;
-import org.apache.airavata.model.workspace.experiment.TaskDetails;
-import org.apache.airavata.model.workspace.experiment.WorkflowNodeDetails;
+import org.apache.airavata.model.workspace.experiment.*;
import org.apache.airavata.orchestrator.core.exception.OrchestratorException;
import org.apache.airavata.orchestrator.cpi.OrchestratorService;
import org.apache.airavata.orchestrator.cpi.orchestrator_cpi_serviceConstants;
@@ -95,7 +94,16 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface {
log.error("Error retrieving the Experiment by the given experimentID: " + experimentId);
return false;
}
+
+ //launching the experiment
orchestrator.launchExperiment(experiment, workflowNodeDetail, taskID);
+
+ // after a successful launch update the experiment status to launched
+ ExperimentStatus status = new ExperimentStatus();
+ status.setExperimentState(ExperimentState.LAUNCHED);
+ status.setTimeOfStateChange(Calendar.getInstance().getTimeInMillis());
+ experiment.setExperimentStatus(status);
+ registry.update(RegistryModelType.EXPERIMENT, experiment, experimentId);
}
}
[2/2] git commit: adding new validator
Posted by la...@apache.org.
adding new validator
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2710f6e3
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2710f6e3
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2710f6e3
Branch: refs/heads/master
Commit: 2710f6e3aab71af1803d79ad8b77d4432a356d05
Parents: 6bb880a
Author: lahiru <la...@apache.org>
Authored: Tue May 20 15:15:30 2014 -0400
Committer: lahiru <la...@apache.org>
Committed: Tue May 20 15:15:30 2014 -0400
----------------------------------------------------------------------
.../impl/ExperimentStatusValidator.java | 45 ++++++++++++++++++++
1 file changed, 45 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/2710f6e3/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/ExperimentStatusValidator.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/ExperimentStatusValidator.java b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/ExperimentStatusValidator.java
new file mode 100644
index 0000000..357f2e2
--- /dev/null
+++ b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/core/validator/impl/ExperimentStatusValidator.java
@@ -0,0 +1,45 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
+package org.apache.airavata.orchestrator.core.validator.impl;
+
+import org.apache.airavata.model.error.ValidatorResult;
+import org.apache.airavata.model.workspace.experiment.*;
+import org.apache.airavata.orchestrator.core.validator.JobMetadataValidator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ExperimentStatusValidator implements JobMetadataValidator {
+ private static Logger log = LoggerFactory.getLogger(ExperimentStatusValidator.class);
+
+ public ValidatorResult validate(Experiment experiment, WorkflowNodeDetails workflowNodeDetail, TaskDetails taskID) {
+ String error = "During the validation step experiment status should be CREATED, But this experiment status is : ";
+ ValidatorResult validatorResult = new ValidatorResult();
+ if (experiment.getExperimentStatus().equals(ExperimentState.CREATED)) {
+ error += experiment.getExperimentStatus().getExperimentState().toString();
+ log.error(error);
+ validatorResult.setErrorDetails(error);
+ validatorResult.setResult(false);;
+ return validatorResult;
+ }
+ validatorResult.setResult(true);
+ return validatorResult;
+ }
+}