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/01/30 17:20:10 UTC
svn commit: r1656047 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container:
common/fsm/Fsm.java common/fsm/iface/IFsm.java jd/JobDriverHelper.java
Author: degenaro
Date: Fri Jan 30 16:20:10 2015
New Revision: 1656047
URL: http://svn.apache.org/r1656047
Log:
UIMA-4069 DUCC Job Driver (JD) system classpath
Remote threads in the FSM's initial state are not active
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/fsm/Fsm.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/fsm/iface/IFsm.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriverHelper.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/fsm/Fsm.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/fsm/Fsm.java?rev=1656047&r1=1656046&r2=1656047&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/fsm/Fsm.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/fsm/Fsm.java Fri Jan 30 16:20:10 2015
@@ -72,6 +72,25 @@ public class Fsm implements IFsmBuilder
setStateInitial(state);
setStateCurrent(state);
}
+
+ @Override
+ public boolean isStateInitial() {
+ boolean retVal = false;
+ IState s0 = getStateInitial();
+ IState s1 = getStateCurrent();
+ if(s0 != null) {
+ if(s1 != null) {
+ String n0 = s0.getName();
+ String n1 = s1.getName();
+ if(n0 != null) {
+ if(n1 != null) {
+ retVal = n0.equals(n1);
+ }
+ }
+ }
+ }
+ return retVal;
+ }
private void setStateInitial(IState value) {
stateInitial = value;
@@ -177,4 +196,5 @@ public class Fsm implements IFsmBuilder
throw new FsmException(e);
}
}
+
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/fsm/iface/IFsm.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/fsm/iface/IFsm.java?rev=1656047&r1=1656046&r2=1656047&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/fsm/iface/IFsm.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/fsm/iface/IFsm.java Fri Jan 30 16:20:10 2015
@@ -27,4 +27,5 @@ public interface IFsm {
public IState getStateCurrent();
public IState getStatePrevious();
public void reset();
+ public boolean isStateInitial();
}
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=1656047&r1=1656046&r2=1656047&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 Fri Jan 30 16:20:10 2015
@@ -24,6 +24,7 @@ import java.util.concurrent.ConcurrentHa
import org.apache.uima.ducc.container.common.MessageBuffer;
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;
import org.apache.uima.ducc.container.common.logger.ILogger;
import org.apache.uima.ducc.container.common.logger.Logger;
@@ -59,6 +60,7 @@ public class JobDriverHelper {
for(Entry<IRemoteWorkerThread, IWorkItem> entry : map.entrySet()) {
IRemoteWorkerThread rwt = entry.getKey();
IWorkItem wi = entry.getValue();
+ IFsm fsm = wi.getFsm();
IWorkItemInfo wii = new WorkItemInfo();
wii.setNodeAddress(rwt.getNodeAddress());
wii.setNodeName(rwt.getNodeName());
@@ -67,13 +69,16 @@ public class JobDriverHelper {
wii.setTid(rwt.getTid());
wii.setSeqNo(wi.getSeqNo());
wii.setOperatingMillis(wi.getMillisOperating());
- list.add(wii);
MessageBuffer mb = new MessageBuffer();
mb.append(Standardize.Label.node.get()+wii.getNodeName());
mb.append(Standardize.Label.pid.get()+wii.getPid());
mb.append(Standardize.Label.tid.get()+wii.getTid());
+ mb.append(Standardize.Label.state.get()+fsm.getStateCurrent().getName());
mb.append(Standardize.Label.operatingMillis.get()+wii.getOperatingMillis());
logger.debug(location, ILogger.null_id, mb);
+ if(!fsm.isStateInitial()) {
+ list.add(wii);
+ }
}
}
catch(Exception e) {