You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2014/06/04 20:47:22 UTC
svn commit: r1600419 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent:
NodeAgent.java config/AgentConfiguration.java
Author: cwiklik
Date: Wed Jun 4 18:47:22 2014
New Revision: 1600419
URL: http://svn.apache.org/r1600419
Log:
UIMA-3858 delay agent shutdown to make sure the final node inventory publish occurs
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/config/AgentConfiguration.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java?rev=1600419&r1=1600418&r2=1600419&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java Wed Jun 4 18:47:22 2014
@@ -1544,7 +1544,12 @@ public class NodeAgent extends AbstractD
}
}
logger.info("stop", null, "Agent managed processes have stopped");
-
+
+ // Delay this thread to make sure that at least one last node inventory publish occurs before Agent goes away. Add extra 30 secs
+ // to the delay to make sure the publish happens.
+ synchronized (this) {
+ wait(configurationFactory.getNodeInventoryPublishDelay() +30000);
+ }
super.stop();
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/config/AgentConfiguration.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/config/AgentConfiguration.java?rev=1600419&r1=1600418&r2=1600419&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/config/AgentConfiguration.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/config/AgentConfiguration.java Wed Jun 4 18:47:22 2014
@@ -380,6 +380,9 @@ public class AgentConfiguration {
return agentTransport.duccEventDispatcher(logger, common.managedServiceEndpoint, camelContext);
}
+ public int getNodeInventoryPublishDelay() {
+ return Integer.parseInt(common.nodeInventoryPublishRate);
+ }
@Bean
public NodeAgent nodeAgent() throws Exception {
try {