Repository: airavata Updated Branches: refs/heads/master 29e122151 -> 2e8dbe16f
Adding a more logs to investigae - AIRAVATA-1072 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2e8dbe16 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2e8dbe16 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2e8dbe16 Branch: refs/heads/master Commit: 2e8dbe16f7570ba75763768c086fe18fc9cd2bf6 Parents: 29e1221 Author: lahiru <[email protected]> Authored: Tue Mar 11 10:16:21 2014 -0400 Committer: lahiru <[email protected]> Committed: Tue Mar 11 10:16:21 2014 -0400 ---------------------------------------------------------------------- .../org/apache/airavata/job/monitor/MonitorManager.java | 9 ++++----- .../job/monitor/impl/pull/qstat/ResourceConnection.java | 1 + .../airavata/job/monitor/impl/push/amqp/AMQPMonitor.java | 3 +++ .../orchestrator/server/OrchestratorServerHandler.java | 1 - pom.xml | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/2e8dbe16/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/MonitorManager.java ---------------------------------------------------------------------- diff --git a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/MonitorManager.java b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/MonitorManager.java index a0927a5..f1e27b1 100644 --- a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/MonitorManager.java +++ b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/MonitorManager.java @@ -34,11 +34,10 @@ import org.apache.airavata.schemas.gfac.GsisshHostType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.validation.constraints.Null; import java.util.ArrayList; import java.util.List; import java.util.concurrent.BlockingQueue; -import java.util.concurrent.LinkedBlockingDeque; +import java.util.concurrent.LinkedBlockingQueue; /* this is the manager class for monitoring system of airavata, @@ -69,9 +68,9 @@ public class MonitorManager { public MonitorManager() { pullMonitors = new ArrayList<PullMonitor>(); pushMonitors = new ArrayList<PushMonitor>(); - pullQueue = new LinkedBlockingDeque<MonitorID>(); - pushQueue = new LinkedBlockingDeque<MonitorID>(); - finishQueue = new LinkedBlockingDeque<MonitorID>(); + pullQueue = new LinkedBlockingQueue<MonitorID>(); + pushQueue = new LinkedBlockingQueue<MonitorID>(); + finishQueue = new LinkedBlockingQueue<MonitorID>(); monitorPublisher = new MonitorPublisher(new EventBus()); registerListener(new AiravataJobStatusUpdator(new RegistryImpl(), finishQueue)); } http://git-wip-us.apache.org/repos/asf/airavata/blob/2e8dbe16/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/pull/qstat/ResourceConnection.java ---------------------------------------------------------------------- diff --git a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/pull/qstat/ResourceConnection.java b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/pull/qstat/ResourceConnection.java index 5155338..6463583 100644 --- a/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/pull/qstat/ResourceConnection.java +++ b/modules/airavata-job-monitor/src/main/java/org/apache/airavata/job/monitor/impl/pull/qstat/ResourceConnection.java @@ -67,6 +67,7 @@ public class ResourceConnection { } private JobState getStatusFromString(String status) { + log.info("parsing the job status returned : " + status); if(status != null){ if("C".equals(status) || "CD".equals(status)){ return JobState.COMPLETE; http://git-wip-us.apache.org/repos/asf/airavata/blob/2e8dbe16/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 807d49d..0929acb 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 @@ -172,6 +172,9 @@ public class AMQPMonitor extends PushMonitor { logger.error("Error unregistering the listener"); throw new AiravataMonitorException("Error unregistering the listener"); } + + + } return true; } http://git-wip-us.apache.org/repos/asf/airavata/blob/2e8dbe16/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 0ac4756..0ac5ed7 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 @@ -171,7 +171,6 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface { // this is a special case because amqp has to be in place before submitting the job if ((hostDescription instanceof GsisshHostType) && Constants.PUSH.equals(((GsisshHostType) hostDescription).getMonitorMode())) { - monitorID = new MonitorID(hostDescription, null, taskID.getTaskID(), experimentId, userName); monitorManager.addAJobToMonitor(monitorID); String jobID = orchestrator.launchExperiment(experimentId, taskID.getTaskID()); http://git-wip-us.apache.org/repos/asf/airavata/blob/2e8dbe16/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b2933f0..f90c148 100644 --- a/pom.xml +++ b/pom.xml @@ -458,7 +458,7 @@ <!--module>samples</module--> <module>modules/server</module> <module>modules/test-suite</module> - <!--module>modules/distribution</module--> + <module>modules/distribution</module> <module>modules/integration-tests</module> <module>modules/airavata-job-monitor</module> </modules>
