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/02/26 16:12:44 UTC
svn commit: r1662477 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main:
java/org/apache/uima/ducc/ws/server/DuccHandler.java
webapp/root/job.details.table.workitems.jsp
Author: degenaro
Date: Thu Feb 26 15:12:43 2015
New Revision: 1662477
URL: http://svn.apache.org/r1662477
Log:
UIMA-4069 DUCC Job Driver (JD) system classpath
investment reset
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.workitems.jsp
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java?rev=1662477&r1=1662476&r2=1662477&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java Thu Feb 26 15:12:43 2015
@@ -1581,6 +1581,7 @@ public class DuccHandler extends DuccAbs
DuccWorkJob job = getJob(jobNo);
if(job != null) {
try {
+ long now = System.currentTimeMillis();
String directory = job.getLogDirectory()+jobNo;
String userId = duccWebSessionManager.getUserId(request);
long wiVersion = job.getWiVersion();
@@ -1597,6 +1598,8 @@ public class DuccHandler extends DuccAbs
DuccMachinesData machinesData = DuccMachinesData.getInstance();
DecimalFormat formatter = new DecimalFormat("##0.00");
double time;
+ String ptime;
+ String itime;
int counter = 0;
for (Entry<IWorkItemState, IWorkItemState> entry : sortedMap.entrySet()) {
StringBuffer row = new StringBuffer();
@@ -1618,6 +1621,9 @@ public class DuccHandler extends DuccAbs
// Processing Time (sec)
row.append("<td align=\"right\">");
row.append("reached");
+ // Investment Time (sec)
+ row.append("<td align=\"right\">");
+ row.append("reached");
// Node (IP)
row.append("<td align=\"right\">");
row.append("*****");
@@ -1660,8 +1666,9 @@ public class DuccHandler extends DuccAbs
row.append("<td align=\"right\">");
row.append(formatter.format(time));
// Processing Time (sec)
- time = getAdjustedTime(wis.getMillisProcessing(), job);
+ time = getAdjustedTime(wis.getMillisProcessing(now), job);
time = time/1000;
+ ptime = formatter.format(time);
row.append("<td align=\"right\">");
switch(state) {
case start:
@@ -1673,7 +1680,21 @@ public class DuccHandler extends DuccAbs
row.append("<span class=\"health_black\">");
break;
}
- row.append(formatter.format(time));
+ row.append(ptime);
+ row.append("</span>");
+ // Investment Time (sec)
+ time = getAdjustedTime(wis.getMillisInvestment(now), job);
+ time = time/1000;
+ itime = formatter.format(time);
+ row.append("<td align=\"right\">");
+ String ispan = "<span class=\"health_black\">";
+ if(time > 0) {
+ if(!itime.equals(ptime)) {
+ ispan = "<span title=\"investment reset\" class=\"health_red\">";
+ }
+ }
+ row.append(ispan);
+ row.append(itime);
row.append("</span>");
// Node (IP)
row.append("<td>");
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.workitems.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.workitems.jsp?rev=1662477&r1=1662476&r2=1662477&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.workitems.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.workitems.jsp Thu Feb 26 15:12:43 2015
@@ -28,10 +28,11 @@ under the License.
<th title="The system assigned work item sequence number" class="sorttable_numeric">SeqNo</th>
<th title="The user assigned work item identity">Id</th>
<th title="The work item status, normally operating or ended">Status</th>
- <th title="The approx. number of seconds elapsed between work item (a) queued for processing and (b) dequeued for start of processing" class="sorttable_numeric">Queuing Time (sec)</th>
- <th title="The approx. number of seconds elapsed between work item (a) dequeued for start of processing and (b) end of processing" class="sorttable_numeric">Processing Time (sec)</th>
- <th title="The node for the work item, by address">Node (IP)</th>
- <th title="The node for the work item, by name">Node (Name)</th>
+ <th title="The approx. number of seconds elapsed between work item (a) queued for processing and (b) dequeued for start of processing" class="sorttable_numeric">Queue<br>Time</th>
+ <th title="The approx. number of seconds elapsed between work item (a) dequeued for start of processing and (b) end of processing" class="sorttable_numeric">Process<br>Time</th>
+ <th title="The approx. number of seconds invested in current epoch" class="sorttable_numeric">Investment<br>Time</th>
+ <th title="The node for the work item, by address">Node<br>(IP)</th>
+ <th title="The node for the work item, by name">Node<br>(Name)</th>
<th title="The PID for the work item" class="sorttable_numeric">PID</th>
</tr>
</thead>