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 2017/12/26 12:17:12 UTC
svn commit: r1819283 - in
/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator:
Orchestrator.java OrchestratorComponent.java
event/OrchestratorEventListener.java
Author: degenaro
Date: Tue Dec 26 12:17:12 2017
New Revision: 1819283
URL: http://svn.apache.org/viewvc?rev=1819283&view=rev
Log:
UIMA-5651 DUCC Web Server (WS) alerts too soon with RED banner
Fix unhandled SM heartbeat publication exception appearing in OR's log.
Modified:
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Orchestrator.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/OrchestratorEventListener.java
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Orchestrator.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Orchestrator.java?rev=1819283&r1=1819282&r2=1819283&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Orchestrator.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Orchestrator.java Tue Dec 26 12:17:12 2017
@@ -26,6 +26,7 @@ import org.apache.uima.ducc.transport.ev
import org.apache.uima.ducc.transport.event.NodeInventoryUpdateDuccEvent;
import org.apache.uima.ducc.transport.event.OrchestratorStateDuccEvent;
import org.apache.uima.ducc.transport.event.RmStateDuccEvent;
+import org.apache.uima.ducc.transport.event.SmHeartbeatDuccEvent;
import org.apache.uima.ducc.transport.event.SmStateDuccEvent;
import org.apache.uima.ducc.transport.event.SubmitJobDuccEvent;
import org.apache.uima.ducc.transport.event.SubmitReservationDuccEvent;
@@ -35,6 +36,7 @@ public interface Orchestrator {
public void reconcileDwState(DuccWorkRequestEvent duccEvent);
public void reconcileRmState(RmStateDuccEvent duccEvent);
public void reconcileSmState(SmStateDuccEvent duccEvent);
+ public void reconcileSmHeartbeat(SmHeartbeatDuccEvent duccEvent);
public void reconcileJdState(JdRequestEvent duccEvent);
public void reconcileNodeInventory(NodeInventoryUpdateDuccEvent duccEvent);
public OrchestratorStateDuccEvent getState();
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java?rev=1819283&r1=1819282&r2=1819283&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java Tue Dec 26 12:17:12 2017
@@ -70,6 +70,7 @@ import org.apache.uima.ducc.transport.ev
import org.apache.uima.ducc.transport.event.NodeInventoryUpdateDuccEvent;
import org.apache.uima.ducc.transport.event.OrchestratorStateDuccEvent;
import org.apache.uima.ducc.transport.event.RmStateDuccEvent;
+import org.apache.uima.ducc.transport.event.SmHeartbeatDuccEvent;
import org.apache.uima.ducc.transport.event.SmStateDuccEvent;
import org.apache.uima.ducc.transport.event.SubmitJobDuccEvent;
import org.apache.uima.ducc.transport.event.SubmitReservationDuccEvent;
@@ -467,6 +468,14 @@ implements Orchestrator {
stateManager.reconcileState(serviceMap);
logger.trace(methodName, null, messages.fetch("exit"));
}
+
+ @Override
+ public void reconcileSmHeartbeat(SmHeartbeatDuccEvent duccEvent) {
+ String methodName = "reconcileSmHeartbeat";
+ logger.trace(methodName, null, messages.fetch("enter"));
+ logger.trace(methodName, null, messages.fetch("exit"));
+ }
+
/**
* Node Inventory State Reconciliation
*/
@@ -1235,4 +1244,5 @@ implements Orchestrator {
exchange.getIn().setBody(reply);
}
}
+
}
Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/OrchestratorEventListener.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/OrchestratorEventListener.java?rev=1819283&r1=1819282&r2=1819283&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/OrchestratorEventListener.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/event/OrchestratorEventListener.java Tue Dec 26 12:17:12 2017
@@ -38,6 +38,7 @@ import org.apache.uima.ducc.transport.ev
import org.apache.uima.ducc.transport.event.NodeInventoryUpdateDuccEvent;
import org.apache.uima.ducc.transport.event.RmStateDuccEvent;
import org.apache.uima.ducc.transport.event.ServiceReplyEvent;
+import org.apache.uima.ducc.transport.event.SmHeartbeatDuccEvent;
import org.apache.uima.ducc.transport.event.SmStateDuccEvent;
import org.apache.uima.ducc.transport.event.SubmitJobDuccEvent;
import org.apache.uima.ducc.transport.event.SubmitReservationDuccEvent;
@@ -142,6 +143,17 @@ public class OrchestratorEventListener i
}
catch(Throwable t) {
logger.error(methodName, null, t);
+ }
+ logger.trace(methodName, null, messages.fetch("exit"));
+ }
+ public void onSmHeartbeatUpdateEvent(@Body SmHeartbeatDuccEvent duccEvent) throws Exception {
+ String methodName = "onSmHeartbeatUpdateEvent";
+ logger.trace(methodName, null, messages.fetch("enter"));
+ try {
+ orchestrator.reconcileSmHeartbeat(duccEvent);
+ }
+ catch(Throwable t) {
+ logger.error(methodName, null, t);
}
logger.trace(methodName, null, messages.fetch("exit"));
}