You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2015/04/23 14:57:55 UTC
svn commit: r1675600 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator:
./ config/ event/
Author: degenaro
Date: Thu Apr 23 12:57:54 2015
New Revision: 1675600
URL: http://svn.apache.org/r1675600
Log:
UIMA-4361 DUCC Job Driver (JD) should only receive pertinent info from Orchestrator (OR)
Removed:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/JdStateEventLogger.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Orchestrator.java
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/config/OrchestratorConfiguration.java
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/OrchestratorEventListener.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Orchestrator.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Orchestrator.java?rev=1675600&r1=1675599&r2=1675600&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Orchestrator.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Orchestrator.java Thu Apr 23 12:57:54 2015
@@ -21,7 +21,7 @@ package org.apache.uima.ducc.orchestrato
import org.apache.uima.ducc.transport.event.CancelJobDuccEvent;
import org.apache.uima.ducc.transport.event.CancelReservationDuccEvent;
import org.apache.uima.ducc.transport.event.CancelServiceDuccEvent;
-import org.apache.uima.ducc.transport.event.JdStateDuccEvent;
+import org.apache.uima.ducc.transport.event.JdRequestEvent;
import org.apache.uima.ducc.transport.event.NodeInventoryUpdateDuccEvent;
import org.apache.uima.ducc.transport.event.OrchestratorAbbreviatedStateDuccEvent;
import org.apache.uima.ducc.transport.event.OrchestratorStateDuccEvent;
@@ -34,7 +34,7 @@ import org.apache.uima.ducc.transport.ev
public interface Orchestrator {
public void reconcileRmState(RmStateDuccEvent duccEvent);
public void reconcileSmState(SmStateDuccEvent duccEvent);
- public void reconcileJdState(JdStateDuccEvent duccEvent);
+ public void reconcileJdState(JdRequestEvent duccEvent);
public void reconcileNodeInventory(NodeInventoryUpdateDuccEvent duccEvent);
public OrchestratorStateDuccEvent getState();
public OrchestratorAbbreviatedStateDuccEvent getAbbreviatedState();
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java?rev=1675600&r1=1675599&r2=1675600&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java Thu Apr 23 12:57:54 2015
@@ -54,7 +54,7 @@ import org.apache.uima.ducc.transport.ev
import org.apache.uima.ducc.transport.event.CancelReservationDuccEvent;
import org.apache.uima.ducc.transport.event.CancelServiceDuccEvent;
import org.apache.uima.ducc.transport.event.IDuccContext.DuccContext;
-import org.apache.uima.ducc.transport.event.JdStateDuccEvent;
+import org.apache.uima.ducc.transport.event.JdRequestEvent;
import org.apache.uima.ducc.transport.event.NodeInventoryUpdateDuccEvent;
import org.apache.uima.ducc.transport.event.OrchestratorAbbreviatedStateDuccEvent;
import org.apache.uima.ducc.transport.event.OrchestratorStateDuccEvent;
@@ -360,9 +360,9 @@ implements Orchestrator {
* Job Driver State Reconciliation
*/
- public void reconcileJdState(JdStateDuccEvent duccEvent) {
+ public void reconcileJdState(JdRequestEvent duccEvent) {
String methodName = "reconcileJdState";
- IDriverStatusReport dsr = duccEvent.getState();
+ IDriverStatusReport dsr = duccEvent.getDriverStatusReport();
DuccId duccId = null;
if(dsr != null) {
duccId = dsr.getDuccId();
@@ -371,9 +371,13 @@ implements Orchestrator {
if(dsr != null) {
logger.info(methodName, duccId, dsr.getLogReport());
stateManager.reconcileState(dsr);
+ String sid = ""+duccId.getFriendly();
+ DuccWorkJob duccWorkJob = (DuccWorkJob) WorkMapHelper.findDuccWork(workMap, sid, this, methodName);
+ duccEvent.setJob(duccWorkJob);
}
logger.trace(methodName, null, messages.fetch("exit"));
}
+
/**
* Resources Manager State Reconciliation
*/
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/config/OrchestratorConfiguration.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/config/OrchestratorConfiguration.java?rev=1675600&r1=1675599&r2=1675600&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/config/OrchestratorConfiguration.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/config/OrchestratorConfiguration.java Thu Apr 23 12:57:54 2015
@@ -44,6 +44,8 @@ import org.apache.uima.ducc.transport.ev
import org.apache.uima.ducc.transport.event.CancelReservationReplyDuccEvent;
import org.apache.uima.ducc.transport.event.CancelServiceDuccEvent;
import org.apache.uima.ducc.transport.event.CancelServiceReplyDuccEvent;
+import org.apache.uima.ducc.transport.event.JdReplyEvent;
+import org.apache.uima.ducc.transport.event.JdRequestEvent;
import org.apache.uima.ducc.transport.event.OrchestratorAbbreviatedStateDuccEvent;
import org.apache.uima.ducc.transport.event.OrchestratorStateDuccEvent;
import org.apache.uima.ducc.transport.event.SubmitJobDuccEvent;
@@ -160,6 +162,12 @@ public class OrchestratorConfiguration {
public void process(Exchange exchange) throws Exception {
Object obj = exchange.getIn().getBody();
+ if(obj instanceof JdRequestEvent) {
+ JdRequestEvent jdRequestEvent = exchange.getIn().getBody(JdRequestEvent.class);
+ JdReplyEvent jdReplyEvent = new JdReplyEvent();
+ jdReplyEvent.setJob(jdRequestEvent.getJob());
+ exchange.getIn().setBody(jdReplyEvent);
+ }
if(obj instanceof SubmitJobDuccEvent) {
SubmitJobDuccEvent submitJobEvent = exchange.getIn().getBody(SubmitJobDuccEvent.class);
SubmitJobReplyDuccEvent replyJobEvent = new SubmitJobReplyDuccEvent();
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/OrchestratorEventListener.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/OrchestratorEventListener.java?rev=1675600&r1=1675599&r2=1675600&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/OrchestratorEventListener.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/OrchestratorEventListener.java Thu Apr 23 12:57:54 2015
@@ -30,7 +30,7 @@ import org.apache.uima.ducc.transport.di
import org.apache.uima.ducc.transport.event.CancelJobDuccEvent;
import org.apache.uima.ducc.transport.event.CancelReservationDuccEvent;
import org.apache.uima.ducc.transport.event.CancelServiceDuccEvent;
-import org.apache.uima.ducc.transport.event.JdStateDuccEvent;
+import org.apache.uima.ducc.transport.event.JdRequestEvent;
import org.apache.uima.ducc.transport.event.NodeInventoryUpdateDuccEvent;
import org.apache.uima.ducc.transport.event.RmStateDuccEvent;
import org.apache.uima.ducc.transport.event.SmStateDuccEvent;
@@ -152,11 +152,10 @@ public class OrchestratorEventListener i
}
logger.trace(methodName, null, messages.fetch("exit"));
}
- public void onJdStateUpdateEvent(@Body JdStateDuccEvent duccEvent) throws Exception {
+ public void onJdStateExchangeEvent(@Body JdRequestEvent duccEvent) throws Exception {
String methodName = "onJdStateUpdateEvent";
logger.trace(methodName, null, messages.fetch("enter"));
try {
- JdStateEventLogger.receiver(duccEvent);
orchestrator.reconcileJdState(duccEvent);
}
catch(Throwable t) {