[airavata] branch develop updated: Enabling/ diabling realtime monitoring

[dimuthuupe]

This is an automated email from the ASF dual-hosted git repository.

dimuthuupe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/develop by this push:
     new 0d8ef6f  Enabling/ diabling realtime monitoring
0d8ef6f is described below

commit 0d8ef6fa8c25125f9b1dd2b3015d7df496ad7f17
Author: Dimuthu Wannipurage <dimuthu.upeks...@gmail.com>
AuthorDate: Mon Mar 11 12:59:10 2019 -0400

    Enabling/ diabling realtime monitoring
---
 .../impl/task/submission/JobSubmissionTask.java    | 31 ++++++++++++----------
 .../src/main/resources/airavata-server.properties  |  3 ++-
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git 
a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/JobSubmissionTask.java
 
b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/JobSubmissionTask.java
index e36c726..d7015fd 100644
--- 
a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/JobSubmissionTask.java
+++ 
b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/JobSubmissionTask.java
@@ -226,22 +226,25 @@ public abstract class JobSubmissionTask extends 
AiravataTask {
     }
 
     private void addMonitoringCommands(GroovyMapData mapData) throws 
ApplicationSettingsException {
-        if (mapData.getPreJobCommands() == null) {
-            mapData.setPreJobCommands(new ArrayList<>());
-        }
 
-        mapData.getPreJobCommands().add(0, "curl -X POST -H \"Content-Type: 
application/vnd.kafka.json.v2+json\" " +
-                "-H \"Accept: application/vnd.kafka.v2+json\" " +
-                "--data '{\"records\":[{\"value\":{\"jobName\":\"" + 
mapData.getJobName() + "\", \"status\":\"RUNNING\"}}]}' \"" +
-                ServerSettings.getSetting("job.status.publish.endpoint") + "\" 
> /dev/null || true");
+        if 
(Boolean.parseBoolean(ServerSettings.getSetting("enable.realtime.monitor"))) {
+            if (mapData.getPreJobCommands() == null) {
+                mapData.setPreJobCommands(new ArrayList<>());
+            }
 
-        if (mapData.getPostJobCommands() == null) {
-            mapData.setPostJobCommands(new ArrayList<>());
-        }
+            mapData.getPreJobCommands().add(0, "curl -X POST -H 
\"Content-Type: application/vnd.kafka.json.v2+json\" " +
+                    "-H \"Accept: application/vnd.kafka.v2+json\" " +
+                    "--data '{\"records\":[{\"value\":{\"jobName\":\"" + 
mapData.getJobName() + "\", \"status\":\"RUNNING\"}}]}' \"" +
+                    ServerSettings.getSetting("job.status.publish.endpoint") + 
"\" > /dev/null || true");
 
-        mapData.getPostJobCommands().add("curl -X POST -H \"Content-Type: 
application/vnd.kafka.json.v2+json\" " +
-                "-H \"Accept: application/vnd.kafka.v2+json\" " +
-                "--data '{\"records\":[{\"value\":{\"jobName\":\"" + 
mapData.getJobName() + "\", \"status\":\"COMPLETED\"}}]}' \"" +
-                ServerSettings.getSetting("job.status.publish.endpoint") + "\" 
> /dev/null || true");
+            if (mapData.getPostJobCommands() == null) {
+                mapData.setPostJobCommands(new ArrayList<>());
+            }
+
+            mapData.getPostJobCommands().add("curl -X POST -H \"Content-Type: 
application/vnd.kafka.json.v2+json\" " +
+                    "-H \"Accept: application/vnd.kafka.v2+json\" " +
+                    "--data '{\"records\":[{\"value\":{\"jobName\":\"" + 
mapData.getJobName() + "\", \"status\":\"COMPLETED\"}}]}' \"" +
+                    ServerSettings.getSetting("job.status.publish.endpoint") + 
"\" > /dev/null || true");
+        }
     }
 }
diff --git 
a/modules/ide-integration/src/main/resources/airavata-server.properties 
b/modules/ide-integration/src/main/resources/airavata-server.properties
index 85d4dec..c0674c6 100644
--- a/modules/ide-integration/src/main/resources/airavata-server.properties
+++ b/modules/ide-integration/src/main/resources/airavata-server.properties
@@ -137,7 +137,7 @@ threadpool.size=10
 start.submitter=true
 embedded.mode=true
 enable.validation=true
-host.scheduler=org.apache.airavata.gfac.impl.DefaultHostScheduler
+host.scheduler=org.apache.airavata.orchestrator.core.schedule.DefaultHostScheduler
 
 ###########################################################################
 #  Registry Server Configurations
@@ -266,6 +266,7 @@ kafka.broker.topic=monitoring-date
 ###########################################################################
 # Job Monitor related properties
 ###########################################################################
+enable.realtime.monitor=False
 job.monitor.broker.publisher.id=AiravataMonitorPublisher
 email.based.monitor.host=imap.gmail.com
 email.based.monitor.store.protocol=imaps