You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ch...@apache.org on 2013/08/26 20:49:22 UTC
svn commit: r1517637 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm:
JobManagerConverter.java scheduler/RmJob.java
Author: challngr
Date: Mon Aug 26 18:49:22 2013
New Revision: 1517637
URL: http://svn.apache.org/r1517637
Log:
UIMA-3215 RM Log updates
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/JobManagerConverter.java
uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/RmJob.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/JobManagerConverter.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/JobManagerConverter.java?rev=1517637&r1=1517636&r2=1517637&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/JobManagerConverter.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/JobManagerConverter.java Mon Aug 26 18:49:22 2013
@@ -105,11 +105,10 @@ public class JobManagerConverter
}
}
- String timeWindowString(ITimeWindow w)
+ String getElapsedTime(ITimeWindow w)
{
if ( w == null ) return "0";
-
- return "" + w.getStart() + ":" + w.getEnd();
+ return w.getElapsed();
}
// void formatSchedulingInfo(DuccId id, IDuccSchedulingInfo si, int remaining_work)
@@ -175,7 +174,7 @@ public class JobManagerConverter
}
logger.info(methodName, job.getDuccId(),
- String.format("total: %s -> %s: %d compl: %s error: %s rem: %d mean: %f",
+ String.format("total: %s -> %s: %d compl: %s error: %s rem: %d mean: %.2f",
state,
job.getStateObject(),
total_work,
@@ -565,7 +564,7 @@ public class JobManagerConverter
logger.info(methodName, jobid,
String.format("Process %5s", pl.getPID()), sl.toString(),
"State:", pr.getProcessState(), "->", pl.getProcessState(),
- timeWindowString(pr.getTimeWindowInit()), timeWindowString(pr.getTimeWindowRun()));
+ getElapsedTime(pr.getTimeWindowInit()), getElapsedTime(pr.getTimeWindowRun()));
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/RmJob.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/RmJob.java?rev=1517637&r1=1517636&r2=1517637&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/RmJob.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-rm/src/main/java/org/apache/uima/ducc/rm/scheduler/RmJob.java Mon Aug 26 18:49:22 2013
@@ -950,8 +950,10 @@ public class RmJob
long future = Math.max(nquestions_remaining - projected, 0); // work still to do after doubling
- logger.info(methodName, getId(), username, "O", getShareOrder(),"T", target, "NTh", (nprocesses * threads), "TI", avg_init, "TR", time_per_item,
- "R", rate, "QR", nquestions_remaining, "P", projected, "F", future,
+ logger.info(methodName, getId(), username, "O", getShareOrder(),"T", target, "NTh", (nprocesses * threads), "TI", avg_init,
+ "TR", (long) time_per_item,
+ "R", String.format("%.4e", rate),
+ "QR", nquestions_remaining, "P", projected, "F", future,
"return", (future / threads));
int answer = (int) future / threads;