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 2016/02/08 21:18:55 UTC
svn commit: r1729245 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server:
DuccHandler.java DuccHandlerClassic.java DuccHandlerJsonFormat.java
Author: degenaro
Date: Mon Feb 8 20:18:55 2016
New Revision: 1729245
URL: http://svn.apache.org/viewvc?rev=1729245&view=rev
Log:
UIMA-4774 DUCC Web Server (WS) PgIn and Swap columns for (Managed) Reservations page
Fix: Display pgin value in red when > 0 and swap > 0
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/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
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=1729245&r1=1729244&r2=1729245&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 Mon Feb 8 20:18:55 2016
@@ -765,7 +765,15 @@ public class DuccHandler extends DuccAbs
}
catch(Exception e) {
}
+ double swap = process.getSwapUsageMax();
+ if((swap * faults) > 0) {
+ sb.append("<span class=\"health_red\""+">");
+ }
+ else {
+ sb.append("<span class=\"health_black\""+">");
+ }
sb.append(faults);
+ sb.append("</span>");
break;
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java?rev=1729245&r1=1729244&r2=1729245&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java Mon Feb 8 20:18:55 2016
@@ -298,8 +298,21 @@ public class DuccHandlerClassic extends
sb.append("</td>");
// Pgin
sb.append("<td valign=\"bottom\" align=\"right\">");
- long pgin = job.getPgInCount();
- sb.append(""+pgin);
+ long faults = 0;
+ try {
+ faults = job.getPgInCount();
+ }
+ catch(Exception e) {
+ }
+ double swapping = job.getSwapUsageGbMax();
+ if((swapping * faults) > 0) {
+ sb.append("<span class=\"health_red\""+">");
+ }
+ else {
+ sb.append("<span class=\"health_black\""+">");
+ }
+ sb.append(faults);
+ sb.append("</span>");
sb.append("</td>");
// Swap
DecimalFormat formatter = new DecimalFormat("###0.0");
@@ -762,13 +775,25 @@ public class DuccHandlerClassic extends
}
sb.append("</td>");
// PgIn
- String pgin = "";
+ sb.append("<td align=\"right\">");
if(duccwork instanceof DuccWorkJob) {
DuccWorkJob job = (DuccWorkJob) duccwork;
- pgin = ""+job.getPgInCount();
+ long faults = 0;
+ try {
+ faults = job.getPgInCount();
+ }
+ catch(Exception e) {
+ }
+ double swapping = job.getSwapUsageGbMax();
+ if((swapping * faults) > 0) {
+ sb.append("<span class=\"health_red\""+">");
+ }
+ else {
+ sb.append("<span class=\"health_black\""+">");
+ }
+ sb.append(faults);
+ sb.append("</span>");
}
- sb.append("<td align=\"right\">");
- sb.append(pgin);
sb.append("</td>");
// Swap
String swap = "";
@@ -1061,8 +1086,22 @@ public class DuccHandlerClassic extends
sb.append("</td>");
// PgIn
sb.append("<td align=\"right\">");
- long pgIn = service.getPgIn();
- sb.append(pgIn);
+ long faults = 0;
+ try {
+ faults = service.getPgIn();
+ }
+ catch(Exception e) {
+ }
+ double swapping = service.getSwap();
+ swapping = swapping/Constants.GB;
+ if((swapping * faults) > 0) {
+ sb.append("<span class=\"health_red\""+">");
+ }
+ else {
+ sb.append("<span class=\"health_black\""+">");
+ }
+ sb.append(faults);
+ sb.append("</span>");
sb.append("</td>");
// Swap
sb.append("<td align=\"right\">");
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java?rev=1729245&r1=1729244&r2=1729245&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java Mon Feb 8 20:18:55 2016
@@ -329,8 +329,21 @@ public class DuccHandlerJsonFormat exten
// Pgin
sb = new StringBuffer();
sb.append("<span>");
- long pgin = job.getPgInCount();
- sb.append(""+pgin);
+ long faults = 0;
+ try {
+ faults = job.getPgInCount();
+ }
+ catch(Exception e) {
+ }
+ double swapping = job.getSwapUsageGbMax();
+ if((swapping * faults) > 0) {
+ sb.append("<span class=\"health_red\""+">");
+ }
+ else {
+ sb.append("<span class=\"health_black\""+">");
+ }
+ sb.append(faults);
+ sb.append("</span>");
sb.append("</span>");
row.add(new JsonPrimitive(sb.toString()));
// Swap
@@ -859,14 +872,26 @@ public class DuccHandlerJsonFormat exten
row.add(new JsonPrimitive(sb.toString()));
// PgIn
sb = new StringBuffer();
- String pgin = "";
+ sb.append("<span>");
if(duccwork instanceof DuccWorkJob) {
DuccWorkJob job = (DuccWorkJob) duccwork;
- pgin = ""+job.getPgInCount();
+ long faults = 0;
+ try {
+ faults = job.getPgInCount();
+ }
+ catch(Exception e) {
+ }
+ double swapping = job.getSwapUsageGbMax();
+ if((swapping * faults) > 0) {
+ sb.append("<span class=\"health_red\""+">");
+ }
+ else {
+ sb.append("<span class=\"health_black\""+">");
+ }
+ sb.append(faults);
+ sb.append("</span>");
}
- sb.append("<span>");
- sb.append(pgin);
- sb.append("<span>");
+ sb.append("</span>");
row.add(new JsonPrimitive(sb.toString()));
// Swap
sb = new StringBuffer();
@@ -1199,8 +1224,23 @@ public class DuccHandlerJsonFormat exten
row.add(new JsonPrimitive(col.toString()));
// Pgin
col = new StringBuffer();
- long pgIn = service.getPgIn();
- col.append(""+pgIn);
+ col.append("<span>");
+ long faults = 0;
+ try {
+ faults = service.getPgIn();
+ }
+ catch(Exception e) {
+ }
+ double swapping = service.getSwap();
+ swapping = swapping/Constants.GB;
+ if((swapping * faults) > 0) {
+ col.append("<span class=\"health_red\""+">");
+ }
+ else {
+ col.append("<span class=\"health_black\""+">");
+ }
+ col.append(faults);
+ col.append("</span>");
row.add(new JsonPrimitive(col.toString()));
// Swap
col = new StringBuffer();