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 2014/11/21 10:54:59 UTC
svn commit: r1640880 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src:
main/java/org/apache/uima/ducc/container/jd/fsm/wi/
main/java/org/apache/uima/ducc/container/jd/mh/
main/java/org/apache/uima/ducc/container/jd/mh/iface/ main/java/org/apa...
Author: degenaro
Date: Fri Nov 21 09:54:58 2014
New Revision: 1640880
URL: http://svn.apache.org/r1640880
Log:
UIMA-4069 Redesign of JD toward the main goal of classpath separation for container (system) code.
fix dispatch count stuck at zero.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAck.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGet.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/IMessageHandler.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/MessageHandler.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IOperatingInfo.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/OperatingInfo.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAck.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAck.java?rev=1640880&r1=1640879&r2=1640880&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAck.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionAck.java Fri Nov 21 09:54:58 2014
@@ -24,6 +24,7 @@ import org.apache.uima.ducc.container.co
import org.apache.uima.ducc.container.common.logger.IComponent;
import org.apache.uima.ducc.container.common.logger.ILogger;
import org.apache.uima.ducc.container.common.logger.Logger;
+import org.apache.uima.ducc.container.jd.JobDriver;
import org.apache.uima.ducc.container.jd.mh.RemoteWorkerIdentity;
import org.apache.uima.ducc.container.jd.mh.iface.remote.IRemoteWorkerIdentity;
import org.apache.uima.ducc.container.jd.wi.IWorkItem;
@@ -57,6 +58,7 @@ public class ActionAck implements IActio
mb.append(Standardize.Label.transNo.get()+trans.getTransactionId().toString());
mb.append(Standardize.Label.seqNo.get()+metaCas.getSystemKey());
mb.append(Standardize.Label.remote.get()+rwi.toString());
+ JobDriver.getInstance().getMessageHandler().incAcks();
logger.info(location, ILogger.null_id, mb.toString());
}
else {MessageBuffer mb = new MessageBuffer();
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGet.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGet.java?rev=1640880&r1=1640879&r2=1640880&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGet.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionGet.java Fri Nov 21 09:54:58 2014
@@ -68,6 +68,7 @@ public class ActionGet implements IActio
mb.append(Standardize.Label.transNo.get()+trans.getTransactionId().toString());
mb.append(Standardize.Label.seqNo.get()+metaCas.getSystemKey());
mb.append(Standardize.Label.remote.get()+rwi.toString());
+ JobDriver.getInstance().getMessageHandler().incGets();
logger.info(location, ILogger.null_id, mb.toString());
}
else {
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/IMessageHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/IMessageHandler.java?rev=1640880&r1=1640879&r2=1640880&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/IMessageHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/IMessageHandler.java Fri Nov 21 09:54:58 2014
@@ -30,4 +30,7 @@ public interface IMessageHandler {
public void handleDownProcess(IProcessInfo processInfo);
public void handlePreemptProcess(IProcessInfo processInfo);
public void handleMetaCasTransation(IMetaCasTransaction trans);
+
+ public void incGets();
+ public void incAcks();
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/MessageHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/MessageHandler.java?rev=1640880&r1=1640879&r2=1640880&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/MessageHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/MessageHandler.java Fri Nov 21 09:54:58 2014
@@ -20,6 +20,7 @@ package org.apache.uima.ducc.container.j
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
import org.apache.uima.ducc.container.common.MessageBuffer;
import org.apache.uima.ducc.container.common.Standardize;
@@ -54,6 +55,20 @@ public class MessageHandler implements I
private static ILogger logger = Logger.getLogger(MessageHandler.class, IComponent.Id.JD.name());
+ private AtomicInteger gets = new AtomicInteger(0);
+ private AtomicInteger acks = new AtomicInteger(0);
+
+ public MessageHandler() {
+ }
+
+ public void incGets() {
+ gets.incrementAndGet();
+ }
+
+ public void incAcks() {
+ acks.incrementAndGet();
+ }
+
@Override
public IOperatingInfo handleGetOperatingInfo() {
String location = "handleGetOperatingInfo";
@@ -70,6 +85,8 @@ public class MessageHandler implements I
oi.setJobId(jd.getJobId());
oi.setWorkItemCrTotal(cms.getCrTotal());
oi.setWorkItemCrFetches(cms.getCrGets());
+ oi.setWorkItemJpGets(gets.get());
+ oi.setWorkItemJpAcks(acks.get());
oi.setWorkItemEndSuccesses(cms.getEndSuccess());
oi.setWorkItemEndFailures(cms.getEndFailure());
oi.setWorkItemEndRetrys(cms.getEndRetry());
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IOperatingInfo.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IOperatingInfo.java?rev=1640880&r1=1640879&r2=1640880&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IOperatingInfo.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IOperatingInfo.java Fri Nov 21 09:54:58 2014
@@ -34,8 +34,8 @@ public interface IOperatingInfo extends
public boolean isWorkItemCrPending();
- public void setWorkItemJpSends(int value);
- public int getWorkItemJpSends();
+ public void setWorkItemJpGets(int value);
+ public int getWorkItemJpGets();
public void setWorkItemJpAcks(int value);
public int getWorkItemJpAcks();
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/OperatingInfo.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/OperatingInfo.java?rev=1640880&r1=1640879&r2=1640880&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/OperatingInfo.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/OperatingInfo.java Fri Nov 21 09:54:58 2014
@@ -31,7 +31,7 @@ public class OperatingInfo implements IO
private int crTotal = 0;
private int crFetches = 0;
- private int jpSends = 0;
+ private int jpGets = 0;
private int jpAcks = 0;
private int jpEndSuccesses = 0;
private int jpEndFailures = 0;
@@ -53,6 +53,9 @@ public class OperatingInfo implements IO
private ArrayList<IWorkItemInfo> activeWorkItemInfo = null;
+ public OperatingInfo() {
+ }
+
@Override
public void setJobId(String value) {
jobId = value;
@@ -89,13 +92,13 @@ public class OperatingInfo implements IO
}
@Override
- public void setWorkItemJpSends(int value) {
- jpSends = value;
+ public void setWorkItemJpGets(int value) {
+ jpGets = value;
}
@Override
- public int getWorkItemJpSends() {
- return jpSends;
+ public int getWorkItemJpGets() {
+ return jpGets;
}
@Override
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java?rev=1640880&r1=1640879&r2=1640880&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java Fri Nov 21 09:54:58 2014
@@ -335,8 +335,8 @@ public class TestSuite extends ATest {
assertTrue(oi.getWorkItemEndSuccesses() == 60);
oi.setWorkItemJpAcks(65);
assertTrue(oi.getWorkItemJpAcks() == 65);
- oi.setWorkItemJpSends(70);
- assertTrue(oi.getWorkItemJpSends() == 70);
+ oi.setWorkItemJpGets(70);
+ assertTrue(oi.getWorkItemJpGets() == 70);
oi.setWorkItemUserProcessingErrorRetries(75);
assertTrue(oi.getWorkItemUserProcessingErrorRetries() == 75);
oi.setWorkItemUserProcessingTimeouts(80);