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 2013/04/05 15:17:25 UTC
svn commit: r1464968 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main:
java/org/apache/uima/ducc/ws/server/ webapp/root/
Author: degenaro
Date: Fri Apr 5 13:17:25 2013
New Revision: 1464968
URL: http://svn.apache.org/r1464968
Log:
UIMA-2800 DUCC webserver (WS) should report RSS usage directly, not as a percentage of requested memory size
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.processes.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.table.processes.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.deployments.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=1464968&r1=1464967&r2=1464968&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 Fri Apr 5 13:17:25 2013
@@ -72,7 +72,6 @@ import org.apache.uima.ducc.transport.ev
import org.apache.uima.ducc.transport.event.common.IDuccStandardInfo;
import org.apache.uima.ducc.transport.event.common.IDuccState.JobState;
import org.apache.uima.ducc.transport.event.common.IDuccTypes.DuccType;
-import org.apache.uima.ducc.transport.event.common.IDuccUnits.MemoryUnits;
import org.apache.uima.ducc.transport.event.common.IDuccWorkJob;
import org.apache.uima.ducc.transport.event.common.IDuccWorkReservation;
import org.apache.uima.ducc.transport.event.common.IResourceState.ProcessDeallocationType;
@@ -640,6 +639,8 @@ public class DuccHandler extends DuccAbs
sb.append(fmtCPU);
sb.append("</td>");
*/
+
+ /*
// %rss
DuccId duccId = job.getDuccId();
String size = job.getSchedulingInfo().getShareMemorySize();
@@ -667,6 +668,15 @@ public class DuccHandler extends DuccAbs
sb.append("<td align=\"right\" "+title+">");
sb.append(displayPctRss);
sb.append("</td>");
+ */
+
+ double rss = process.getResidentMemory();
+ rss = rss/GB;
+ String displayRss = formatter.format(rss);
+ sb.append("<td align=\"right\" "+">");
+ sb.append(displayRss);
+ sb.append("</td>");
+
if(type.equals("SP")) {
//
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.processes.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.processes.jsp?rev=1464968&r1=1464967&r2=1464968&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.processes.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.processes.jsp Fri Apr 5 13:17:25 2013
@@ -43,7 +43,7 @@ under the License.
<!--
<th title="Cumulative CPU time, hh:mm:ss">CPU</th>
-->
- <th title="Resident Storage Size, as a percentage of process memory requirement in job specification">%RSS</th>
+ <th title="Resident Storage Size in GB, current if state=running or maximum if state=completed">RSS</th>
<th title="Average seconds per work item">Time<br>Avg</th>
<th title="Maximum seconds for any work item">Time<br>Max</th>
<th title="Minimum seconds for any work item">Time<br>Min</th>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.table.processes.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.table.processes.jsp?rev=1464968&r1=1464967&r2=1464968&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.table.processes.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/reservation.details.table.processes.jsp Fri Apr 5 13:17:25 2013
@@ -47,7 +47,7 @@ under the License.
<!--
<th title="Cumulative CPU time, hh:mm:ss">CPU</th>
-->
- <th title="Resident Storage Size, as a percentage of process memory requirement in specification">%RSS</th>
+ <th title="Resident Storage Size in GB, current if state=running or maximum if state=completed">RSS</th>
<!--
<th title="Average seconds per work item">Time<br>Avg</th>
<th title="Maximum seconds for any work item">Time<br>Max</th>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.deployments.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.deployments.jsp?rev=1464968&r1=1464967&r2=1464968&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.deployments.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/service.details.table.deployments.jsp Fri Apr 5 13:17:25 2013
@@ -43,7 +43,7 @@ under the License.
<!--
<th title="Cumulative CPU time, hh:mm:ss">CPU</th>
-->
- <th title="Resident Storage Size, as a percentage of process memory requirement in job specification">%RSS</th>
+ <th title="Resident Storage Size in GB, current if state=running or maximum if state=completed">RSS</th>
<!--
<th title="Average seconds per work item">Time<br>Avg</th>
<th title="Maximum seconds for any work item">Time<br>Max</th>