Author: degenaro
Date: Tue Nov 11 14:25:02 2014
New Revision: 1638118
URL: http://svn.apache.org/r1638118
Log:
UIMA-4069 Redesign of JD toward the main goal of classpath separation for
container (system) code.
Accommodate (but ignore, at least for now) node address.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/files/json/JsonWorkItemState.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriverHelper.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/RemoteWorkerIdentity.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/remote/IRemoteNode.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/NodeInfo.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/ProcessInfo.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/net/iface/IMetaCasRequester.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/net/impl/MetaCasTransaction.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/ATest.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestJson.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/ThreadInfo.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/files/json/JsonWorkItemState.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/files/json/JsonWorkItemState.java?rev=1638118&r1=1638117&r2=1638118&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/files/json/JsonWorkItemState.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/files/json/JsonWorkItemState.java
Tue Nov 11 14:25:02 2014
@@ -25,7 +25,8 @@ public class JsonWorkItemState implement
private String systemKey = null;
private String userKey = null;
- private String node = null;
+ private String nodeName = null;
+ private String nodeAddress = null;
private int pid = 0;
private int tid = 0;
@@ -55,16 +56,26 @@ public class JsonWorkItemState implement
}
@Override
- public String getNode() {
- return node;
+ public String getNodeName() {
+ return nodeName;
}
@Override
- public void setNode(String value) {
- node = value;
+ public void setNodeName(String value) {
+ nodeName = value;
+ }
+
+ @Override
+ public String getNodeAddress() {
+ return nodeAddress;
}
@Override
+ public void setNodeAddress(String value) {
+ nodeAddress = value;
+ }
+
+ @Override
public int getPid() {
return pid;
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriverHelper.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriverHelper.java?rev=1638118&r1=1638117&r2=1638118&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriverHelper.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriverHelper.java
Tue Nov 11 14:25:02 2014
@@ -48,7 +48,7 @@ public class JobDriverHelper {
ConcurrentHashMap<IRemoteWorkerIdentity, IWorkItem> map =
jd.getMap();
for(Entry<IRemoteWorkerIdentity, IWorkItem> entry :
map.entrySet()) {
IRemoteWorkerIdentity rwi = entry.getKey();
- String node = rwi.getNode();
+ String node = rwi.getNodeName();
String pid = ""+rwi.getPid();
ArrayList<String> list = null;
if(!mapOperating.containsKey(node)) {
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/RemoteWorkerIdentity.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/RemoteWorkerIdentity.java?rev=1638118&r1=1638117&r2=1638118&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/RemoteWorkerIdentity.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/RemoteWorkerIdentity.java
Tue Nov 11 14:25:02 2014
@@ -30,18 +30,21 @@ public class RemoteWorkerIdentity implem
private IContainerLogger logger =
ContainerLogger.getLogger(RemoteWorkerIdentity.class,
IContainerLogger.Component.JD.name());
- private String node = null;
+ private String nodeName = null;
+ private String nodeAddress = null;
private int pid = 0;
private int tid = 0;
public RemoteWorkerIdentity(IMetaCasRequester metaCasRequester) {
- setNode(metaCasRequester.getRequesterName());
+ setNodeName(metaCasRequester.getRequesterName());
+ setNodeAddress(metaCasRequester.getRequesterAddress());
setPid(metaCasRequester.getRequesterProcessId());
setTid(metaCasRequester.getRequesterThreadId());
}
- public RemoteWorkerIdentity(String node, int pid, int tid) {
- setNode(node);
+ public RemoteWorkerIdentity(String nodeName, String nodeAddress, int
pid, int tid) {
+ setNodeName(nodeName);
+ setNodeAddress(nodeName);
setPid(pid);
setTid(tid);
}
@@ -49,8 +52,8 @@ public class RemoteWorkerIdentity implem
@Override
public String toString() {
StringBuffer sb = new StringBuffer();
- if(node != null) {
- sb.append(node);
+ if(nodeName != null) {
+ sb.append(nodeName);
sb.append(".");
}
sb.append(pid);
@@ -60,13 +63,23 @@ public class RemoteWorkerIdentity implem
}
@Override
- public String getNode() {
- return node;
+ public String getNodeName() {
+ return nodeName;
}
@Override
- public void setNode(String value) {
- node = value;
+ public void setNodeName(String value) {
+ nodeName = value;
+ }
+
+ @Override
+ public String getNodeAddress() {
+ return nodeAddress;
+ }
+
+ @Override
+ public void setNodeAddress(String value) {
+ nodeAddress = value;
}
@Override
@@ -89,13 +102,13 @@ public class RemoteWorkerIdentity implem
tid = value;
}
- private int compareNode(RemoteWorkerIdentity that) {
+ private int compareNodeName(RemoteWorkerIdentity that) {
int retVal = 0;
- String thisNode = this.getNode();
- String thatNode = that.getNode();
- if(thisNode != null) {
- if(thatNode != null) {
- retVal = thisNode.compareTo(thatNode);
+ String thisNodeName = this.getNodeName();
+ String thatNodeName = that.getNodeName();
+ if(thisNodeName != null) {
+ if(thatNodeName != null) {
+ retVal = thisNodeName.compareTo(thatNodeName);
}
}
return retVal;
@@ -125,7 +138,7 @@ public class RemoteWorkerIdentity implem
if(o != null) {
RemoteWorkerIdentity that =
(RemoteWorkerIdentity) o;
if(retVal == 0) {
- retVal = compareNode(that);
+ retVal = compareNodeName(that);
}
if(retVal == 0) {
retVal = comparePid(that);
@@ -145,10 +158,10 @@ public class RemoteWorkerIdentity implem
public int hashCode() {
final int prime = 31;
int result = 1;
- String thisNode = this.getNode();
+ String thisNodeName = this.getNodeName();
Integer thisPid = new Integer(this.pid);
Integer thisTid = new Integer(this.tid);
- result = prime * result + ((thisNode == null) ? 0 :
thisNode.hashCode());
+ result = prime * result + ((thisNodeName == null) ? 0 :
thisNodeName.hashCode());
result = prime * result + ((thisPid == null) ? 0 :
thisPid.hashCode());
result = prime * result + ((thisTid == null) ? 0 :
thisTid.hashCode());
return result;
@@ -179,13 +192,13 @@ public class RemoteWorkerIdentity implem
/////
- private int compareToNode(IRemoteNode that) {
+ private int compareToNodeName(IRemoteNode that) {
int retVal = 0;
- String thisNode = this.getNode();
- String thatNode = that.getNode();
- if(thisNode != null) {
- if(thatNode != null) {
- retVal = thisNode.compareTo(thatNode);
+ String thisNodeName = this.getNodeName();
+ String thatNodeName = that.getNodeName();
+ if(thisNodeName != null) {
+ if(thatNodeName != null) {
+ retVal = thisNodeName.compareTo(thatNodeName);
}
}
return retVal;
@@ -203,7 +216,7 @@ public class RemoteWorkerIdentity implem
public boolean comprises(IRemoteNode that) {
boolean retVal = false;
if(that != null) {
- if(this.compareToNode(that) == 0) {
+ if(this.compareToNodeName(that) == 0) {
retVal = true;
}
}
@@ -214,7 +227,7 @@ public class RemoteWorkerIdentity implem
public boolean comprises(IRemotePid that) {
boolean retVal = false;
if(that != null) {
- if(this.compareToNode(that) == 0) {
+ if(this.compareToNodeName(that) == 0) {
if(this.compareToPid(that) == 0) {
retVal = true;
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/remote/IRemoteNode.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/remote/IRemoteNode.java?rev=1638118&r1=1638117&r2=1638118&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/remote/IRemoteNode.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/remote/IRemoteNode.java
Tue Nov 11 14:25:02 2014
@@ -20,6 +20,9 @@ package org.apache.uima.ducc.container.j
public interface IRemoteNode {
- public String getNode();
- public void setNode(String value);
+ public String getNodeName();
+ public void setNodeName(String value);
+
+ public String getNodeAddress();
+ public void setNodeAddress(String value);
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/NodeInfo.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/NodeInfo.java?rev=1638118&r1=1638117&r2=1638118&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/NodeInfo.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/NodeInfo.java
Tue Nov 11 14:25:02 2014
@@ -22,20 +22,32 @@ import org.apache.uima.ducc.container.jd
public class NodeInfo implements INodeInfo {
- private String node = null;
+ private String nodeName = null;
+ private String nodeAddress = null;
- public NodeInfo(String node) {
- setNode(node);
+ public NodeInfo(String nodeName, String nodeAddress) {
+ setNodeName(nodeName);
+ setNodeAddress(nodeAddress);
}
@Override
- public String getNode() {
- return node;
+ public String getNodeName() {
+ return nodeName;
}
@Override
- public void setNode(String value) {
- node = value;
+ public void setNodeName(String value) {
+ nodeName = value;
+ }
+
+ @Override
+ public String getNodeAddress() {
+ return nodeAddress;
+ }
+
+ @Override
+ public void setNodeAddress(String value) {
+ nodeAddress = value;
}
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/ProcessInfo.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/ProcessInfo.java?rev=1638118&r1=1638117&r2=1638118&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/ProcessInfo.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/ProcessInfo.java
Tue Nov 11 14:25:02 2014
@@ -22,22 +22,32 @@ import org.apache.uima.ducc.container.jd
public class ProcessInfo implements IProcessInfo {
- private String node = null;
+ private String nodeName = null;
+ private String nodeAddress = null;
private int pid = 0;
- public ProcessInfo(String node, int pid) {
- setNode(node);
+ public ProcessInfo(String nodeName, String nodeAddress, int pid) {
+ setNodeName(nodeName);
setPid(pid);
}
@Override
- public String getNode() {
- return node;
+ public String getNodeName() {
+ return nodeName;
}
@Override
- public void setNode(String value) {
- node = value;
+ public void setNodeName(String value) {
+ nodeName = value;
+ }
+ @Override
+ public String getNodeAddress() {
+ return nodeAddress;
+ }
+
+ @Override
+ public void setNodeAddress(String value) {
+ nodeAddress = value;
}
@Override
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/net/iface/IMetaCasRequester.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/net/iface/IMetaCasRequester.java?rev=1638118&r1=1638117&r2=1638118&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/net/iface/IMetaCasRequester.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/net/iface/IMetaCasRequester.java
Tue Nov 11 14:25:02 2014
@@ -25,6 +25,9 @@ public interface IMetaCasRequester exten
public String getRequesterName();
public void setRequesterName(String value);
+ public String getRequesterAddress();
+ public void setRequesterAddress(String value);
+
public int getRequesterProcessId();
public void setRequesterProcessId(int value);
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/net/impl/MetaCasTransaction.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/net/impl/MetaCasTransaction.java?rev=1638118&r1=1638117&r2=1638118&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/net/impl/MetaCasTransaction.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/net/impl/MetaCasTransaction.java
Tue Nov 11 14:25:02 2014
@@ -35,6 +35,7 @@ public class MetaCasTransaction implemen
private int providerPort = 0;
private String requesterName = null;
+ private String requesterAddress = null;
private int requesterPid = 0;
private int requesterTid = 0;
@@ -85,6 +86,16 @@ public class MetaCasTransaction implemen
}
@Override
+ public String getRequesterAddress() {
+ return requesterAddress;
+ }
+
+ @Override
+ public void setRequesterAddress(String value) {
+ requesterAddress = value;
+ }
+
+ @Override
public int getRequesterProcessId() {
return requesterPid;
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/ATest.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/ATest.java?rev=1638118&r1=1638117&r2=1638118&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/ATest.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/ATest.java
Tue Nov 11 14:25:02 2014
@@ -27,9 +27,9 @@ import org.junit.BeforeClass;
public abstract class ATest {
private boolean disabled = false;
- private boolean verbose = false;
+ private boolean verbose = true;
private boolean warned = false;
- private boolean debug = false;
+ private boolean debug = true;
public boolean isDisabled(String name ) {
if(disabled) {
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.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/TestDispatcher.java?rev=1638118&r1=1638117&r2=1638118&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java
Tue Nov 11 14:25:02 2014
@@ -119,7 +119,7 @@ public class TestDispatcher extends ATes
Dispatcher dispatcher = new Dispatcher();
ThreadInfoFactory tif = new ThreadInfoFactory(1,1,1);
ThreadInfo ti = tif.getRandom();
- String node = ti.getNode();
+ String node = ti.getNodeName();
int pid = ti.getPid();
int tid = ti.getTid();
int casNo = 1;
@@ -169,7 +169,7 @@ public class TestDispatcher extends ATes
debug("random:"+ti.toKey());
int casNo = 1;
IMetaCas metaCasPrevious = null;
- IMetaCas metaCas =
transGet(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
+ IMetaCas metaCas =
transGet(dispatcher,ti.getNodeName(),ti.getPid(),ti.getTid(),casNo);
assertTrue(metaCas != null);
while(metaCas != null) {
IOperatingInfo oi =
dispatcher.handleGetOperatingInfo();
@@ -179,14 +179,14 @@ public class TestDispatcher extends ATes
else {
assertTrue(oi.isWorkItemCrPending());
}
-
transAck(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
-
transEnd(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
+
transAck(dispatcher,ti.getNodeName(),ti.getPid(),ti.getTid(),casNo);
+
transEnd(dispatcher,ti.getNodeName(),ti.getPid(),ti.getTid(),casNo);
casNo++;
metaCasPrevious = metaCas;
assertTrue(metaCasPrevious != null);
ti = tif.getRandom();
debug("random:"+ti.toKey());
- metaCas =
transGet(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
+ metaCas =
transGet(dispatcher,ti.getNodeName(),ti.getPid(),ti.getTid(),casNo);
}
assertTrue(metaCasPrevious.getSystemKey().equals("100"));
asExpected("CASes processed count == 100");
@@ -225,20 +225,20 @@ public class TestDispatcher extends ATes
debug("random:"+ti.toKey());
int casNo = 1;
IMetaCas metaCasPrevious = null;
- IMetaCas metaCas =
transGet(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
+ IMetaCas metaCas =
transGet(dispatcher,ti.getNodeName(),ti.getPid(),ti.getTid(),casNo);
assertTrue(metaCas != null);
IOperatingInfo oi = dispatcher.handleGetOperatingInfo();
while(oi.getWorkItemCrFetches() < 100) {
if(metaCas != null) {
-
transAck(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
-
//transEnd(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
+
transAck(dispatcher,ti.getNodeName(),ti.getPid(),ti.getTid(),casNo);
+
//transEnd(dispatcher,ti.getNodeName(),ti.getPid(),ti.getTid(),casNo);
casNo++;
metaCasPrevious = metaCas;
assertTrue(metaCasPrevious != null);
}
ti = tif.getRandom();
debug("random:"+ti.toKey());
- metaCas =
transGet(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
+ metaCas =
transGet(dispatcher,ti.getNodeName(),ti.getPid(),ti.getTid(),casNo);
oi = dispatcher.handleGetOperatingInfo();
}
assertTrue(oi.getWorkItemCrFetches() == 100);
@@ -283,11 +283,11 @@ public class TestDispatcher extends ATes
debug("random:"+ti.toKey());
int casNo = -1;
IMetaCas metaCasPrevious = null;
- IMetaCas metaCas =
transGet(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
+ IMetaCas metaCas =
transGet(dispatcher,ti.getNodeName(),ti.getPid(),ti.getTid(),casNo);
assertTrue(metaCas != null);
while(metaCas != null) {
randomPreemptTest03(dispatcher,ti);
-
transAck(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
+
transAck(dispatcher,ti.getNodeName(),ti.getPid(),ti.getTid(),casNo);
randomPreemptTest03(dispatcher,ti);
try {
Thread.sleep(20);
@@ -295,14 +295,14 @@ public class TestDispatcher extends ATes
catch(Exception e) {
}
dispatcher.handleGetOperatingInfo();
-
transEnd(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
+
transEnd(dispatcher,ti.getNodeName(),ti.getPid(),ti.getTid(),casNo);
randomPreemptTest03(dispatcher,ti);
casNo--;
metaCasPrevious = metaCas;
assertTrue(metaCasPrevious != null);
ti = tif.getRandom();
debug("random:"+ti.toKey());
- metaCas =
transGet(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
+ metaCas =
transGet(dispatcher,ti.getNodeName(),ti.getPid(),ti.getTid(),casNo);
}
assertTrue(metaCasPrevious.getSystemKey().equals("100"));
asExpected("CASes processed count == 100");
@@ -336,7 +336,7 @@ public class TestDispatcher extends ATes
private void randomPreemptTest03(Dispatcher dispatcher, ThreadInfo ti) {
int n = randomTest03.nextInt(100);
if(n < pctTest03) {
- IProcessInfo processInfo = new
ProcessInfo(ti.getNode(),ti.getPid());
+ IProcessInfo processInfo = new
ProcessInfo(ti.getNodeName(),null,ti.getPid());
dispatcher.handlePreemptProcess(processInfo);
}
}
@@ -366,23 +366,23 @@ public class TestDispatcher extends ATes
debug("random:"+ti.toKey());
int casNo = -1;
IMetaCas metaCasPrevious = null;
- IMetaCas metaCas =
transGet(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
+ IMetaCas metaCas =
transGet(dispatcher,ti.getNodeName(),ti.getPid(),ti.getTid(),casNo);
assertTrue(metaCas != null);
int inject = 0;
while(metaCas != null) {
-
transAck(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
+
transAck(dispatcher,ti.getNodeName(),ti.getPid(),ti.getTid(),casNo);
if(randomErrorTest04()) {
Exception exception = new
RuntimeException("injected error test #04");
metaCas.setUserSpaceException(exception);
inject++;
}
-
transEnd(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
+
transEnd(dispatcher,ti.getNodeName(),ti.getPid(),ti.getTid(),casNo);
casNo--;
metaCasPrevious = metaCas;
assertTrue(metaCasPrevious != null);
ti = tif.getRandom();
debug("random:"+ti.toKey());
- metaCas =
transGet(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
+ metaCas =
transGet(dispatcher,ti.getNodeName(),ti.getPid(),ti.getTid(),casNo);
}
assertTrue(metaCasPrevious.getSystemKey().equals("100"));
asExpected("CASes processed count == 100");
@@ -453,23 +453,23 @@ public class TestDispatcher extends ATes
debug("random:"+ti.toKey());
int casNo = -1;
IMetaCas metaCasPrevious = null;
- IMetaCas metaCas =
transGet(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
+ IMetaCas metaCas =
transGet(dispatcher,ti.getNodeName(),ti.getPid(),ti.getTid(),casNo);
assertTrue(metaCas != null);
int inject = 0;
while(metaCas != null) {
-
transAck(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
+
transAck(dispatcher,ti.getNodeName(),ti.getPid(),ti.getTid(),casNo);
if(randomErrorTest05()) {
Exception exception = new
RuntimeException("injected error test #05");
metaCas.setUserSpaceException(exception);
inject++;
}
-
transEnd(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
+
transEnd(dispatcher,ti.getNodeName(),ti.getPid(),ti.getTid(),casNo);
casNo--;
metaCasPrevious = metaCas;
assertTrue(metaCasPrevious != null);
ti = tif.getRandom();
debug("random:"+ti.toKey());
- metaCas =
transGet(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
+ metaCas =
transGet(dispatcher,ti.getNodeName(),ti.getPid(),ti.getTid(),casNo);
}
assertTrue(metaCasPrevious.getSystemKey().equals("100"));
asExpected("CASes processed count == 100");
@@ -521,23 +521,23 @@ public class TestDispatcher extends ATes
debug("random:"+ti.toKey());
int casNo = -1;
IMetaCas metaCasPrevious = null;
- IMetaCas metaCas =
transGet(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
+ IMetaCas metaCas =
transGet(dispatcher,ti.getNodeName(),ti.getPid(),ti.getTid(),casNo);
assertTrue(metaCas != null);
int inject = 0;
while(metaCas != null) {
-
transAck(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
+
transAck(dispatcher,ti.getNodeName(),ti.getPid(),ti.getTid(),casNo);
if(randomErrorTest05()) {
Exception exception = new
RuntimeException("injected error test #05");
metaCas.setUserSpaceException(exception);
inject++;
}
-
transEnd(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
+
transEnd(dispatcher,ti.getNodeName(),ti.getPid(),ti.getTid(),casNo);
casNo--;
metaCasPrevious = metaCas;
assertTrue(metaCasPrevious != null);
ti = tif.getRandom();
debug("random:"+ti.toKey());
- metaCas =
transGet(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
+ metaCas =
transGet(dispatcher,ti.getNodeName(),ti.getPid(),ti.getTid(),casNo);
}
assertTrue(metaCasPrevious.getSystemKey().equals("100"));
asExpected("CASes processed count == 100");
@@ -604,23 +604,23 @@ public class TestDispatcher extends ATes
debug("random:"+ti.toKey());
int casNo = -1;
IMetaCas metaCasPrevious = null;
- IMetaCas metaCas =
transGet(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
+ IMetaCas metaCas =
transGet(dispatcher,ti.getNodeName(),ti.getPid(),ti.getTid(),casNo);
assertTrue(metaCas != null);
int inject = 0;
while(metaCas != null) {
-
transAck(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
+
transAck(dispatcher,ti.getNodeName(),ti.getPid(),ti.getTid(),casNo);
if(randomErrorTest06()) {
Exception exception = new
RuntimeException("injected error test #06");
metaCas.setUserSpaceException(exception);
inject++;
}
-
transEnd(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
+
transEnd(dispatcher,ti.getNodeName(),ti.getPid(),ti.getTid(),casNo);
casNo--;
metaCasPrevious = metaCas;
assertTrue(metaCasPrevious != null);
ti = tif.getRandom();
debug("random:"+ti.toKey());
- metaCas =
transGet(dispatcher,ti.getNode(),ti.getPid(),ti.getTid(),casNo);
+ metaCas =
transGet(dispatcher,ti.getNodeName(),ti.getPid(),ti.getTid(),casNo);
}
assertTrue(metaCasPrevious.getSystemKey().equals("100"));
asExpected("CASes processed count == 100");
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestJson.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/TestJson.java?rev=1638118&r1=1638117&r2=1638118&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestJson.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestJson.java
Tue Nov 11 14:25:02 2014
@@ -30,7 +30,7 @@ import org.junit.Test;
public class TestJson extends ATest {
private void compare(JsonWorkItemState jwisA, JsonWorkItemState jwisB) {
- assertTrue(jwisA.getNode().equals(jwisB.getNode()));
+ assertTrue(jwisA.getNodeName().equals(jwisB.getNodeName()));
assertTrue(jwisA.getPid() == jwisB.getPid());
assertTrue(jwisA.getTid() == jwisB.getTid());
assertTrue(jwisA.getProcessingTime() ==
jwisB.getProcessingTime());
@@ -47,7 +47,7 @@ public class TestJson extends ATest {
}
try {
JsonWorkItemState jwis1 = new JsonWorkItemState();
- jwis1.setNode("node01");
+ jwis1.setNodeName("node01");
jwis1.setPid(23);
jwis1.setTid(45);
jwis1.setProcessingTime(5000);
@@ -56,7 +56,7 @@ public class TestJson extends ATest {
jwis1.setUserKey("usr0001");
jwis1.setStatus("running");
JsonWorkItemState jwis2 = new JsonWorkItemState();
- jwis2.setNode("node01");
+ jwis2.setNodeName("node01");
jwis2.setPid(23);
jwis2.setTid(46);
jwis2.setProcessingTime(0000);
@@ -86,7 +86,7 @@ public class TestJson extends ATest {
}
try {
JsonWorkItemState jwis1 = new JsonWorkItemState();
- jwis1.setNode("node01");
+ jwis1.setNodeName("node01");
jwis1.setPid(23);
jwis1.setTid(45);
jwis1.setProcessingTime(5000);
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=1638118&r1=1638117&r2=1638118&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
Tue Nov 11 14:25:02 2014
@@ -327,8 +327,8 @@ public class TestSuite extends ATest {
String n01 = "node01";
int p10 = 10;
int t20 = 20;
- RemoteWorkerIdentity rwi01A = new
RemoteWorkerIdentity(n01,p10,t20);
- RemoteWorkerIdentity rwi01B = new
RemoteWorkerIdentity(n01,p10,t20);
+ RemoteWorkerIdentity rwi01A = new
RemoteWorkerIdentity(n01,null,p10,t20);
+ RemoteWorkerIdentity rwi01B = new
RemoteWorkerIdentity(n01,null,p10,t20);
assertTrue(rwi01A.equals(rwi01A));
assertTrue(rwi01B.equals(rwi01B));
assertTrue(rwi01A.equals(rwi01B));
@@ -338,16 +338,16 @@ public class TestSuite extends ATest {
String n02 = "node02";
int p30 = 30;
int t40 = 40;
- RemoteWorkerIdentity rwi02A = new
RemoteWorkerIdentity(n02,p10,t20);
- RemoteWorkerIdentity rwi01C = new
RemoteWorkerIdentity(n01,p30,t20);
- RemoteWorkerIdentity rwi01D = new
RemoteWorkerIdentity(n01,p10,t40);
+ RemoteWorkerIdentity rwi02A = new
RemoteWorkerIdentity(n02,null,p10,t20);
+ RemoteWorkerIdentity rwi01C = new
RemoteWorkerIdentity(n01,null,p30,t20);
+ RemoteWorkerIdentity rwi01D = new
RemoteWorkerIdentity(n01,null,p10,t40);
assertTrue(!rwi01A.equals(rwi02A));
assertTrue(!rwi01A.equals(rwi01C));
assertTrue(!rwi01A.equals(rwi01D));
assertTrue(rwi01A.compareTo(rwi02A) != 0);
assertTrue(rwi01A.compareTo(rwi01C) != 0);
assertTrue(rwi01A.compareTo(rwi01D) != 0);
- assertTrue(rwi01A.getNode().equals(n01));
+ assertTrue(rwi01A.getNodeName().equals(n01));
assertTrue(rwi01A.getPid() == p10);
assertTrue(rwi01A.getTid() == t20);
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/ThreadInfo.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/helper/ThreadInfo.java?rev=1638118&r1=1638117&r2=1638118&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/ThreadInfo.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/ThreadInfo.java
Tue Nov 11 14:25:02 2014
@@ -20,18 +20,31 @@ package org.apache.uima.ducc.container.j
public class ThreadInfo {
- private int node = 0;
+ private int nodeName = 0;
+ private int nodeAddress = 0;
private int pid = 0;
private int tid = 0;
- public ThreadInfo(int node, int pid, int tid) {
- this.node = node;
+ public ThreadInfo(int nodeName, int nodeAddress, int pid, int tid) {
+ this.nodeName = nodeName;
+ this.nodeAddress = nodeAddress;
this.pid = pid;
this.tid = tid;
}
- public String getNode() {
- return "node"+node;
+ public ThreadInfo(int nodeName, int pid, int tid) {
+ this.nodeName = nodeName;
+ this.nodeAddress = nodeName;
+ this.pid = pid;
+ this.tid = tid;
+ }
+
+ public String getNodeName() {
+ return "nodeName"+nodeName;
+ }
+
+ public String getNodeAddress() {
+ return "nodeAddress"+nodeAddress;
}
public int getPid() {
@@ -43,6 +56,6 @@ public class ThreadInfo {
}
public String toKey() {
- return getNode()+":"+getPid()+":"+getTid();
+ return getNodeName()+":"+getPid()+":"+getTid();
}
}
