Repository: airavata Updated Branches: refs/heads/master 1a86ed907 -> 1263b2b04
fixing build error Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/68a55896 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/68a55896 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/68a55896 Branch: refs/heads/master Commit: 68a55896f31baadabad652279f63998ff09feb32 Parents: 24babee Author: lahiru <[email protected]> Authored: Mon Mar 10 15:22:28 2014 -0400 Committer: lahiru <[email protected]> Committed: Mon Mar 10 15:22:28 2014 -0400 ---------------------------------------------------------------------- .../airavata/client/tools/DocumentCreator.java | 1 + .../job/monitor/impl/push/amqp/AMQPMonitor.java | 42 +++++++++++--------- .../impl/push/amqp/JSONMessageParser.java | 7 +++- .../airavata/job/monitor/AMQPMonitorTest.java | 4 +- 4 files changed, 33 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/68a55896/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreator.java ---------------------------------------------------------------------- diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreator.java b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreator.java index eb3a0ca..d7f9859 100644 --- a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreator.java +++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreator.java @@ -638,6 +638,7 @@ public class DocumentCreator { ((GsisshHostType) host.getType()).setJobManager("slurm"); ((GsisshHostType) host.getType()).setInstalledPath("/usr/bin/"); ((GsisshHostType) host.getType()).setPort(2222); + ((GsisshHostType) host.getType()).setMonitorMode("push"); // ((GsisshHostType) host.getType()).setMo(2222); http://git-wip-us.apache.org/repos/asf/airavata/blob/68a55896/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/push/amqp/AMQPMonitor.java ---------------------------------------------------------------------- diff --git a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/push/amqp/AMQPMonitor.java b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/push/amqp/AMQPMonitor.java index b5b6e8f..5548ae3 100644 --- a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/push/amqp/AMQPMonitor.java +++ b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/push/amqp/AMQPMonitor.java @@ -75,36 +75,22 @@ public class AMQPMonitor extends PushMonitor { this.publisher = publisher; this.runningQueue = runningQueue; // these will be initialized by the MonitorManager this.finishQueue = finishQueue; // these will be initialized by the MonitorManager - availableChannels = new HashMap<String, Channel>(); + this.availableChannels = new HashMap<String, Channel>(); this.connectionName = connectionName; this.proxyPath = proxyPath; this.amqpHosts = hosts; } - public void initialize(String proxyPath,String connectionName,List<String> hosts){ + public void initialize(String proxyPath, String connectionName, List<String> hosts) { + this.availableChannels = new HashMap<String, Channel>(); this.connectionName = connectionName; this.proxyPath = proxyPath; this.amqpHosts = hosts; } - public void run() { - try { - // before going to the while true mode we start unregister thread - while (true) { - MonitorID take = runningQueue.take(); - this.registerListener(take); - } - } catch (InterruptedException e) { - e.printStackTrace(); - } catch (AiravataMonitorException e) { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. - } - //To change body of implemented methods use File | Settings | File Templates. - } - @Override public boolean registerListener(MonitorID monitorID) throws AiravataMonitorException { - // do initial check before creating a channel, otherwise resources will be waste + // do initial check before creating a channel, otherwise resources will be waste // and channel id will be malformed // this check is not implemented in MonitorManager because it depends on // the Monitoring implementation (what data is required) @@ -131,9 +117,27 @@ public class AMQPMonitor extends PushMonitor { logger.error("Error creating the connection to finishQueue the job:" + monitorID.getJobID()); } } - return false; //To change body of implemented methods use File | Settings | File Templates. + return true; + } + + public void run() { + // before going to the while true mode we start unregister thread + while (true) { + try { + MonitorID take = runningQueue.take(); + this.registerListener(take); + } catch (AiravataMonitorException e) { // catch any exceptino inside the loop + e.printStackTrace(); + } catch (InterruptedException e) { + e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + } catch (Exception e){ + e.printStackTrace(); + } + } } + + private void checkMonitorID(MonitorID monitorID) throws AiravataMonitorException { if (monitorID.getUserName() == null) { String error = "Username has to be given for monitoring"; http://git-wip-us.apache.org/repos/asf/airavata/blob/68a55896/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/push/amqp/JSONMessageParser.java ---------------------------------------------------------------------- diff --git a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/push/amqp/JSONMessageParser.java b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/push/amqp/JSONMessageParser.java index 0dfac7e..d281c0f 100644 --- a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/push/amqp/JSONMessageParser.java +++ b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/push/amqp/JSONMessageParser.java @@ -23,10 +23,15 @@ package org.apache.airavata.job.monitor.impl.push.amqp; import org.apache.airavata.job.monitor.MonitorID; import org.apache.airavata.job.monitor.core.MessageParser; import org.apache.airavata.job.monitor.state.JobStatus; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class JSONMessageParser implements MessageParser { - public JobStatus parseMessage(String message,MonitorID monitorID) { + private final static Logger logger = LoggerFactory.getLogger(JSONMessageParser.class); + + public JobStatus parseMessage(String message, MonitorID monitorID) { /*todo write a json message parser here*/ + logger.info("Mesage parse invoked"); return new JobStatus(); } } http://git-wip-us.apache.org/repos/asf/airavata/blob/68a55896/modules/airavata-job-monitor/src/test/java/org/apache/airavata/job/monitor/AMQPMonitorTest.java ---------------------------------------------------------------------- diff --git a/modules/airavata-job-monitor/src/test/java/org/apache/airavata/job/monitor/AMQPMonitorTest.java b/modules/airavata-job-monitor/src/test/java/org/apache/airavata/job/monitor/AMQPMonitorTest.java index 6327050..4e35434 100644 --- a/modules/airavata-job-monitor/src/test/java/org/apache/airavata/job/monitor/AMQPMonitorTest.java +++ b/modules/airavata-job-monitor/src/test/java/org/apache/airavata/job/monitor/AMQPMonitorTest.java @@ -36,6 +36,7 @@ import org.junit.Test; import java.io.File; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; public class AMQPMonitorTest { @@ -68,7 +69,8 @@ public class AMQPMonitorTest { monitorManager = new MonitorManager(); AMQPMonitor amqpMonitor = new AMQPMonitor(monitorManager.getMonitorPublisher(), - monitorManager.getPullQueue(), monitorManager.getFinishQueue()); + monitorManager.getPullQueue(), monitorManager.getFinishQueue(),"/Users/lahirugunathilake/Downloads/x509up_u503876","xsede_private", + Arrays.asList("info1.dyn.teragrid.org,info2.dyn.teragrid.org".split(","))); try { monitorManager.addPushMonitor(amqpMonitor); monitorManager.launchMonitor();
