Repository: airavata Updated Branches: refs/heads/master d33b96e5b -> 353b73624
refactoring to use specified resource job manager than hard coding slurm Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/353b7362 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/353b7362 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/353b7362 Branch: refs/heads/master Commit: 353b7362458e0203a619e6b27ea33fd059c82c79 Parents: d33b96e Author: Saminda Wijeratne <[email protected]> Authored: Sat May 24 23:32:37 2014 -0700 Committer: Saminda Wijeratne <[email protected]> Committed: Sat May 24 23:32:37 2014 -0700 ---------------------------------------------------------------------- .../server/handler/ApplicationCatalogHandler.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/353b7362/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/ApplicationCatalogHandler.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/ApplicationCatalogHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/ApplicationCatalogHandler.java index 050748d..9da3ed2 100644 --- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/ApplicationCatalogHandler.java +++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/ApplicationCatalogHandler.java @@ -60,8 +60,12 @@ import org.apache.airavata.schemas.gfac.GlobusHostType; import org.apache.airavata.schemas.gfac.GsisshHostType; import org.apache.airavata.schemas.gfac.SSHHostType; import org.apache.thrift.TException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ApplicationCatalogHandler implements Iface { + private static final Logger logger = LoggerFactory.getLogger(AiravataServerHandler.class); + AiravataRegistry2 registry; private AiravataRegistry2 getRegistry() throws RegistryException, AiravataConfigurationException{ if (registry==null){ @@ -215,7 +219,7 @@ public class ApplicationCatalogHandler implements Iface { d.setPostJobCommands(Arrays.asList(gsisshHostType.getPostJobCommandsArray())); d.setPreJobCommands(Arrays.asList(gsisshHostType.getPreJobCommandsArray())); d.setSshPort(gsisshHostType.getPort()); - d.setResourceJobManager(ResourceJobManager.SLURM); + d.setResourceJobManager(getResourceJobManager(gsisshHostType.getJobManager())); } else { throw new Exception("Saved job protocol is not GSISSH"); } @@ -226,6 +230,16 @@ public class ApplicationCatalogHandler implements Iface { } } + private ResourceJobManager getResourceJobManager(String jobManager) { + ResourceJobManager rjm=ResourceJobManager.SLURM; + try { + rjm = ResourceJobManager.valueOf(jobManager.toUpperCase()); + } catch (Exception e) { + logger.error(jobManager+" does not match a known resource job manager."); + } + return rjm; + } + @Override public GlobusJobSubmission getGlobusJobSubmissionProtocol( String globusJobSubmissionProtocolResourceId)
