Author: degenaro
Date: Wed Nov 5 14:37:48 2014
New Revision: 1636880
URL: http://svn.apache.org/r1636880
Log:
UIMA-4069 Redesign of JD toward the main goal of classpath separation for
container (system) code.
WorkItem statistics: TOD most recent start
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Standardize.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/Dispatcher.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/main/java/org/apache/uima/ducc/container/jd/wi/IRunningWorkItemStatistics.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/RunningWorkItemStatistics.java
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Standardize.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Standardize.java?rev=1636880&r1=1636879&r2=1636880&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Standardize.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Standardize.java
Wed Nov 5 14:37:48 2014
@@ -29,6 +29,7 @@ public class Standardize {
finishedMillisAvg,
runningMillisMax,
runningMillisMin,
+ todMostRecentStart,
state,
event,
curr,
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/Dispatcher.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/Dispatcher.java?rev=1636880&r1=1636879&r2=1636880&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/Dispatcher.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/Dispatcher.java
Wed Nov 5 14:37:48 2014
@@ -72,6 +72,7 @@ public class Dispatcher {
oi.setWorkItemFinishedMillisAvg(wis.getMillisAvg());
oi.setWorkItemRunningMillisMin(rwis.getMillisMin());
oi.setWorkItemRunningMillisMax(rwis.getMillisMax());
+
oi.setWorkItemTodMostRecentStart(rwis.getTodMostRecentStart());
MessageBuffer mb = new MessageBuffer();
mb.append(Standardize.Label.crTotal.get()+oi.getWorkItemCrTotal());
mb.append(Standardize.Label.crFetches.get()+oi.getWorkItemCrFetches());
@@ -81,6 +82,7 @@ public class Dispatcher {
mb.append(Standardize.Label.finishedMillisAvg.get()+oi.getWorkItemFinishedMillisAvg());
mb.append(Standardize.Label.runningMillisMin.get()+oi.getWorkItemRunningMillisMin());
mb.append(Standardize.Label.runningMillisMax.get()+oi.getWorkItemRunningMillisMax());
+
mb.append(Standardize.Label.todMostRecentStart.get()+oi.getWorkItemTodMostRecentStart());
logger.debug(location, IEntityId.null_id,
mb.toString());
retVal = oi;
}
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=1636880&r1=1636879&r2=1636880&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
Wed Nov 5 14:37:48 2014
@@ -65,4 +65,9 @@ public interface IOperatingInfo {
public void setWorkItemRunningMillisMax(long value);
public long getWorkItemRunningMillisMax();
+
+ //
+
+ public void setWorkItemTodMostRecentStart(long value);
+ public long getWorkItemTodMostRecentStart();
}
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=1636880&r1=1636879&r2=1636880&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
Wed Nov 5 14:37:48 2014
@@ -39,6 +39,8 @@ public class OperatingInfo implements IO
private long runningMillisMin = 0;
private long runningMillisMax = 0;
+ private long todMostRecentStart = 0;
+
@Override
public void setWorkItemCrTotal(int value) {
crTotal = value;
@@ -179,4 +181,14 @@ public class OperatingInfo implements IO
return runningMillisMax;
}
+ @Override
+ public void setWorkItemTodMostRecentStart(long value) {
+ todMostRecentStart = value;
+ }
+
+ @Override
+ public long getWorkItemTodMostRecentStart() {
+ return todMostRecentStart;
+ }
+
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/IRunningWorkItemStatistics.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/IRunningWorkItemStatistics.java?rev=1636880&r1=1636879&r2=1636880&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/IRunningWorkItemStatistics.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/IRunningWorkItemStatistics.java
Wed Nov 5 14:37:48 2014
@@ -25,4 +25,7 @@ public interface IRunningWorkItemStatist
public void setMillisMin(long value);
public long getMillisMin();
+
+ public void setTodMostRecentStart(long value);
+ public long getTodMostRecentStart();
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/RunningWorkItemStatistics.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/RunningWorkItemStatistics.java?rev=1636880&r1=1636879&r2=1636880&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/RunningWorkItemStatistics.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/wi/RunningWorkItemStatistics.java
Wed Nov 5 14:37:48 2014
@@ -29,9 +29,12 @@ public class RunningWorkItemStatistics i
private long millisMin = 0;
private long millisMax = 0;
+ private long todMostRecentStart = 0;
+
public static RunningWorkItemStatistics getCurrent() {
long min = Long.MAX_VALUE;
long max = 0;
+ long todMrs = 0;
ConcurrentHashMap<IRemoteWorkerIdentity, IWorkItem> map =
JobDriverCommon.getInstance().getMap();
for(Entry<IRemoteWorkerIdentity, IWorkItem> entry :
map.entrySet()) {
IWorkItem wi = entry.getValue();
@@ -44,17 +47,22 @@ public class RunningWorkItemStatistics i
min = time;
}
}
+ long tod = wi.getTodAck();
+ if(tod > todMrs) {
+ todMrs = tod;
+ }
}
if(min > max) {
min = max;
}
- RunningWorkItemStatistics retVal = new
RunningWorkItemStatistics(min,max);
+ RunningWorkItemStatistics retVal = new
RunningWorkItemStatistics(min,max,todMrs);
return retVal;
}
- public RunningWorkItemStatistics(long min, long max) {
+ public RunningWorkItemStatistics(long min, long max, long todMRS) {
setMillisMin(min);
setMillisMax(max);
+ setTodMostRecentStart(todMRS);
}
@Override
@@ -76,5 +84,15 @@ public class RunningWorkItemStatistics i
public long getMillisMax() {
return millisMax;
}
+
+ @Override
+ public void setTodMostRecentStart(long value) {
+ todMostRecentStart = value;
+ }
+
+ @Override
+ public long getTodMostRecentStart() {
+ return todMostRecentStart;
+ }
}
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=1636880&r1=1636879&r2=1636880&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
Wed Nov 5 14:37:48 2014
@@ -288,6 +288,9 @@ public class TestDispatcher {
catch(Exception e) {
}
dispatcher.handleGetOperatingInfo();
+ long tod = oi.getWorkItemTodMostRecentStart();
+ assertTrue(tod > 0);
+ asExpected("Most Recent Start > 0, value="+tod);
}
catch(Exception e) {
e.printStackTrace();
