airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lah...@apache.org
Subject git commit: fixing https://issues.apache.org/jira/browse/AIRAVATA-1089
Date Tue, 25 Mar 2014 19:19:48 GMT
Repository: airavata
Updated Branches:
  refs/heads/master f60565b39 -> cb826d37d


fixing https://issues.apache.org/jira/browse/AIRAVATA-1089


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/cb826d37
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/cb826d37
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/cb826d37

Branch: refs/heads/master
Commit: cb826d37dd608a78f11e85c5708ec659b07340f0
Parents: f60565b
Author: lahiru <lahiru@apache.org>
Authored: Tue Mar 25 15:19:41 2014 -0400
Committer: lahiru <lahiru@apache.org>
Committed: Tue Mar 25 15:19:41 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/airavata/job/monitor/MonitorManager.java     | 4 ++++
 .../airavata/orchestrator/server/OrchestratorServerHandler.java  | 4 ++++
 2 files changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/cb826d37/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/job/monitor/MonitorManager.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/job/monitor/MonitorManager.java
b/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/job/monitor/MonitorManager.java
index 7c7d31c..3db297d 100644
--- a/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/job/monitor/MonitorManager.java
+++ b/modules/gfac/gfac-monitor/src/main/java/org/apache/airavata/job/monitor/MonitorManager.java
@@ -35,6 +35,7 @@ import org.apache.airavata.job.monitor.util.CommonUtils;
 import org.apache.airavata.persistance.registry.jpa.impl.RegistryImpl;
 import org.apache.airavata.schemas.gfac.GlobusHostType;
 import org.apache.airavata.schemas.gfac.GsisshHostType;
+import org.apache.airavata.schemas.gfac.SSHHostType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -168,6 +169,9 @@ public class MonitorManager {
             }
         } else if(monitorID.getHost().getType() instanceof GlobusHostType){
             logger.error("Monitoring does not support GlubusHostType resources");
+        } else if(monitorID.getHost().getType() instanceof SSHHostType) {
+            logger.error("Monitoring does not support GlubusHostType resources");
+            localJobQueue.add(monitorID);
         } else {
             // we assume this is a type of localJobtype
             localJobQueue.add(monitorID);

http://git-wip-us.apache.org/repos/asf/airavata/blob/cb826d37/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 b00fe4f..e2f25fc 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
@@ -93,6 +93,10 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface
{
 
             // loading Monitor configuration
             String monitors = properties.getProperty("monitors");
+            if(monitors == null) {
+                log.error("No Monitor is configured, so job monitoring will not monitor any
job");
+                return;
+            }
             List<String> monitorList = Arrays.asList(monitors.split(","));
             List<String> list = Arrays.asList(properties.getProperty("amqp.hosts").split(","));
             String proxyPath = properties.getProperty("proxy.file.path");


Mime
View raw message