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/05/26 22:02:13 UTC
svn commit: r1681835 - 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/wi/ test/java/org/apache/ui...
Author: degenaro
Date: Tue May 26 20:02:13 2015
New Revision: 1681835
URL: http://svn.apache.org/r1681835
Log:
UIMA-4432 DUCC Job Driver (JD) WiTracker logging for assign/unassign should include seqNo
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionSend.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/wi/WiTracker.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/wi/tracker/TestWiTracker.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionSend.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/ActionSend.java?rev=1681835&r1=1681834&r2=1681835&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionSend.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/fsm/wi/ActionSend.java Tue May 26 20:02:13 2015
@@ -24,8 +24,10 @@ import org.apache.uima.ducc.container.co
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.log.LoggerHelper;
+import org.apache.uima.ducc.container.jd.mh.iface.remote.IRemoteWorkerThread;
import org.apache.uima.ducc.container.jd.timeout.TimeoutManager;
import org.apache.uima.ducc.container.jd.wi.IWorkItem;
+import org.apache.uima.ducc.container.jd.wi.WiTracker;
import org.apache.uima.ducc.container.net.iface.IMetaCas;
import org.apache.uima.ducc.container.net.iface.IMetaCasTransaction;
@@ -45,7 +47,9 @@ public class ActionSend implements IActi
IActionData actionData = (IActionData) objectData;
try {
if(actionData != null) {
- IWorkItem wi = actionData.getWorkItem();
+ IRemoteWorkerThread rwt = actionData.getRemoteWorkerThread();
+ WiTracker tracker = WiTracker.getInstance();
+ IWorkItem wi = tracker.assign(rwt);
IMetaCasTransaction trans = actionData.getMetaCasTransaction();
IMetaCas metaCas = trans.getMetaCas();
wi.setMetaCas(metaCas);
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=1681835&r1=1681834&r2=1681835&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 Tue May 26 20:02:13 2015
@@ -503,7 +503,7 @@ public class MessageHandler implements I
private void handleMetaCasTransationGet(IMetaCasTransaction trans, IRemoteWorkerThread rwt) {
WiTracker tracker = WiTracker.getInstance();
- IWorkItem wi = tracker.assign(rwt);
+ IWorkItem wi = tracker.link(rwt);
IFsm fsm = wi.getFsm();
IEvent event = WiFsm.Get_Request;
Object actionData = new ActionData(wi, rwt, trans);
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/WiTracker.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/WiTracker.java?rev=1681835&r1=1681834&r2=1681835&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/WiTracker.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/WiTracker.java Tue May 26 20:02:13 2015
@@ -22,6 +22,7 @@ import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.uima.ducc.container.common.MessageBuffer;
+import org.apache.uima.ducc.container.common.MetaCasHelper;
import org.apache.uima.ducc.container.common.Standardize;
import org.apache.uima.ducc.container.common.fsm.iface.IFsm;
import org.apache.uima.ducc.container.common.logger.IComponent;
@@ -54,9 +55,8 @@ public class WiTracker {
return JobDriver.getInstance().getRemoteWorkerThreadMap();
}
- public IWorkItem assign(IRemoteWorkerThread rwt) {
- String location = "assign";
- ConcurrentHashMap<IRemoteWorkerThread, IWorkItem> map = getMap();
+ public IWorkItem link(IRemoteWorkerThread rwt) {
+ ConcurrentHashMap<IRemoteWorkerThread, IWorkItem> map = getMap();
IWorkItem wi = null;
if(rwt != null) {
wi = find(rwt);
@@ -66,7 +66,20 @@ public class WiTracker {
wi = new WorkItem(metaCas, fsm);
map.put(rwt, wi);
}
+ }
+ return wi;
+ }
+
+ public IWorkItem assign(IRemoteWorkerThread rwt) {
+ String location = "assign";
+ IWorkItem wi = null;
+ if(rwt != null) {
+ wi = find(rwt);
+ IMetaCas metaCas = wi.getMetaCas();
+ MetaCasHelper metaCasHelper = new MetaCasHelper(metaCas);
+ int seqNo = metaCasHelper.getSystemKey();
MessageBuffer mb = new MessageBuffer();
+ mb.append(Standardize.Label.seqNo.get()+seqNo);
mb.append(Standardize.Label.remote.get()+rwt.toString());
logger.debug(location, ILogger.null_id, mb.toString());
}
@@ -76,10 +89,15 @@ public class WiTracker {
public void unassign(IWorkItem wi) {
String location = "unassign";
- ConcurrentHashMap<IRemoteWorkerThread, IWorkItem> map = getMap();
+ ConcurrentHashMap<IRemoteWorkerThread, IWorkItem> map = getMap();
IRemoteWorkerThread rwt = find(wi);
if(rwt != null) {
+ wi = find(rwt);
+ IMetaCas metaCas = wi.getMetaCas();
+ MetaCasHelper metaCasHelper = new MetaCasHelper(metaCas);
+ int seqNo = metaCasHelper.getSystemKey();
MessageBuffer mb = new MessageBuffer();
+ mb.append(Standardize.Label.seqNo.get()+seqNo);
mb.append(Standardize.Label.remote.get()+rwt.toString());
logger.debug(location, ILogger.null_id, mb.toString());
map.remove(rwt);
@@ -89,7 +107,7 @@ public class WiTracker {
public IWorkItem find(IRemoteWorkerThread rwt) {
String location = "find";
- ConcurrentHashMap<IRemoteWorkerThread, IWorkItem> map = getMap();
+ ConcurrentHashMap<IRemoteWorkerThread, IWorkItem> map = getMap();
IWorkItem wi = null;
if(rwt != null) {
wi = map.get(rwt);
@@ -110,7 +128,7 @@ public class WiTracker {
}
public IRemoteWorkerThread find(IWorkItem wi) {
- ConcurrentHashMap<IRemoteWorkerThread, IWorkItem> map = getMap();
+ ConcurrentHashMap<IRemoteWorkerThread, IWorkItem> map = getMap();
IRemoteWorkerThread rwt = null;
if(wi != null) {
for(Entry<IRemoteWorkerThread, IWorkItem> entry : map.entrySet()) {
@@ -178,13 +196,13 @@ public class WiTracker {
}
public int getSize() {
- ConcurrentHashMap<IRemoteWorkerThread, IWorkItem> map = getMap();
+ ConcurrentHashMap<IRemoteWorkerThread, IWorkItem> map = getMap();
return map.size();
}
private void report() {
String location = "report";
- ConcurrentHashMap<IRemoteWorkerThread, IWorkItem> map = getMap();
+ ConcurrentHashMap<IRemoteWorkerThread, IWorkItem> map = getMap();
MessageBuffer mb = new MessageBuffer();
mb.append(Standardize.Label.size.get()+map.size());
logger.trace(location, ILogger.null_id, mb.toString());
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/wi/tracker/TestWiTracker.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/wi/tracker/TestWiTracker.java?rev=1681835&r1=1681834&r2=1681835&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/wi/tracker/TestWiTracker.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/wi/tracker/TestWiTracker.java Tue May 26 20:02:13 2015
@@ -88,7 +88,8 @@ public class TestWiTracker extends TestB
int seqNo = 1;
//
IRemoteWorkerThread rwt01A = getRemoteWorkerThread();
- IWorkItem wi01A = tracker.assign(rwt01A);
+ IWorkItem wi01A = tracker.link(rwt01A);
+ tracker.assign(rwt01A);
IMetaCas metaCas = getMetaCas(1);
wi01A.setMetaCas(metaCas);
//
@@ -102,6 +103,7 @@ public class TestWiTracker extends TestB
seqNo = 2;
IWorkItem wi02A = getWi(seqNo);
IRemoteWorkerThread rwt02A = getRemoteWorkerThread();
+ tracker.link(rwt02A);
tracker.assign(rwt02A);
wi02A.setMetaCas(metaCas);
//