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 2014/06/20 15:28:59 UTC
svn commit: r1604170 - in /uima/sandbox/uima-ducc/trunk:
uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/ws/json/
uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/
uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/ uima-ducc-web/...
Author: degenaro
Date: Fri Jun 20 13:28:58 2014
New Revision: 1604170
URL: http://svn.apache.org/r1604170
Log:
UIMA-3902 DUCC Web Server (WS) swap delta on Machines page
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/ws/json/MachineFacts.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/MachineFactsTest.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
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.machines.jsp
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/ws/json/MachineFacts.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/ws/json/MachineFacts.java?rev=1604170&r1=1604169&r2=1604170&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/ws/json/MachineFacts.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/ws/json/MachineFacts.java Fri Jun 20 13:28:58 2014
@@ -31,6 +31,7 @@ public class MachineFacts implements Ser
public String memoryEffective;
public String memoryTotal;
public String swapInuse;
+ public String swapDelta;
public String swapFree;
public List<String> aliens;
public String sharesTotal;
@@ -43,6 +44,7 @@ public class MachineFacts implements Ser
String memoryEffective,
String memoryTotal,
String swapInuse,
+ String swapDelta,
String swapFree,
List<String> aliens,
String sharesTotal,
@@ -56,6 +58,7 @@ public class MachineFacts implements Ser
this.memoryEffective = memoryEffective;
this.memoryTotal = memoryTotal;
this.swapInuse = swapInuse;
+ this.swapDelta = swapDelta;
this.swapFree = swapFree;
this.aliens = aliens;
this.sharesTotal = sharesTotal;
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/MachineFactsTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/MachineFactsTest.java?rev=1604170&r1=1604169&r2=1604170&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/MachineFactsTest.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/MachineFactsTest.java Fri Jun 20 13:28:58 2014
@@ -145,12 +145,13 @@ public class MachineFactsTest {
String reserve = createMemory();
String memory = createMemory();
String swap = createSwap();
+ String delta = createSwap();
String free = createFree();
List<String> aliens = createAliens();
String sharesTotal = createSharesTotal(memory);
String sharesInuse = createSharesInuse(sharesTotal);
String heartbeat = createHeartbeat();
- MachineFacts machineFacts = new MachineFacts(status,ip,name, reserve, memory, swap, free, aliens, sharesTotal, sharesInuse, heartbeat);
+ MachineFacts machineFacts = new MachineFacts(status,ip,name, reserve, memory, swap, delta, free, aliens, sharesTotal, sharesInuse, heartbeat);
return machineFacts;
}
@@ -175,6 +176,7 @@ public class MachineFactsTest {
&& m1.sharesTotal.equals(m2.sharesTotal)
&& m1.status.equals(m2.status)
&& m1.swapInuse.equals(m2.swapInuse)
+ && m1.swapDelta.equals(m2.swapDelta)
&& m1.swapFree.equals(m2.swapFree)
) {
retVal = true;
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=1604170&r1=1604169&r2=1604170&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 Fri Jun 20 13:28:58 2014
@@ -1655,7 +1655,9 @@ public class DuccHandlerClassic extends
int sumMemoryEffective = 0;
int sumMemoryTotal = 0;
int sumSwapInuse = 0;
+/*
int sumSwapDelta = 0;
+*/
int sumSwapFree = 0;
int sumAliens = 0;
int sumSharesTotal = 0;
@@ -1677,7 +1679,9 @@ public class DuccHandlerClassic extends
sumMemoryEffective += Integer.parseInt(facts.memoryEffective);
sumMemoryTotal += Integer.parseInt(facts.memoryTotal);
sumSwapInuse += Integer.parseInt(facts.swapInuse);
+/*
sumSwapDelta += Integer.parseInt(facts.swapDelta);
+*/
sumSwapFree += Integer.parseInt(facts.swapFree);
sumAliens += facts.aliens.size();
sumSharesTotal += Integer.parseInt(facts.sharesTotal);
@@ -1718,10 +1722,12 @@ public class DuccHandlerClassic extends
row.append("<td align=\"right\">");
row.append(""+sumSwapInuse);
row.append("</td>");
+/*
// Swap: delta
row.append("<td align=\"right\">");
row.append(""+sumSwapDelta);
row.append("</td>");
+*/
// Swap: free
row.append("<td align=\"right\">");
row.append(""+sumSwapFree);
@@ -1808,6 +1814,7 @@ public class DuccHandlerClassic extends
row.append(sb);
}
row.append("</td>");
+/*
// Swap: delta
sb = new StringBuffer();
String delta = facts.swapDelta;
@@ -1824,6 +1831,7 @@ public class DuccHandlerClassic extends
row.append(sb);
}
row.append("</td>");
+*/
// Swap: free
row.append("<td align=\"right\">");
if(!status.equals("defined")) {
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=1604170&r1=1604169&r2=1604170&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 Fri Jun 20 13:28:58 2014
@@ -1261,7 +1261,9 @@ public class DuccHandlerJsonFormat exten
int sumMemoryEffective = 0;
int sumMemoryTotal = 0;
int sumSwapInuse = 0;
+/*
int sumSwapDelta = 0;
+*/
int sumSwapFree = 0;
int sumAliens = 0;
int sumSharesTotal = 0;
@@ -1283,7 +1285,9 @@ public class DuccHandlerJsonFormat exten
sumMemoryEffective += Integer.parseInt(facts.memoryEffective);
sumMemoryTotal += Integer.parseInt(facts.memoryTotal);
sumSwapInuse += Integer.parseInt(facts.swapInuse);
+/*
sumSwapDelta += Integer.parseInt(facts.swapDelta);
+*/
sumSwapFree += Integer.parseInt(facts.swapFree);
sumAliens += facts.aliens.size();
sumSharesTotal += Integer.parseInt(facts.sharesTotal);
@@ -1309,8 +1313,10 @@ public class DuccHandlerJsonFormat exten
row.add(new JsonPrimitive(sumMemoryTotal));
// Swap: inuse
row.add(new JsonPrimitive(sumSwapInuse));
+/*
// Swap: delta
row.add(new JsonPrimitive(sumSwapDelta));
+*/
// Swap: free
row.add(new JsonPrimitive(sumSwapFree));
// Alien PIDs
@@ -1377,6 +1383,7 @@ public class DuccHandlerJsonFormat exten
else {
row.add(new JsonPrimitive(""));
}
+/*
// Swap: delta
sb = new StringBuffer();
String delta = facts.swapDelta;
@@ -1394,6 +1401,7 @@ public class DuccHandlerJsonFormat exten
else {
row.add(new JsonPrimitive(""));
}
+*/
// Swap: free
if(!status.equals("defined")) {
row.add(new JsonPrimitive(facts.swapFree));
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.machines.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.machines.jsp?rev=1604170&r1=1604169&r2=1604170&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.machines.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/system.machines.jsp Fri Jun 20 13:28:58 2014
@@ -46,8 +46,7 @@ under the License.
$('td:eq(8)' , nRow).css( "text-align", "right" );
$('td:eq(9)' , nRow).css( "text-align", "right" );
$('td:eq(10)' , nRow).css( "text-align", "right" );
- $('td:eq(11)' , nRow).css( "text-align", "right" );
- $('td:eq(12)' , nRow).css( "text-align", "right" );
+ $('td:eq(11)' , nRow).css( "text-align", "right" );
return nRow;
},
} );
@@ -108,7 +107,6 @@ if (table_style.equals("scroll")) {
<th align="left" title="The host effective memory size, in GB (hint: specify this size to reserve entire machine)" >Memory(GB):usable</th>
<th align="left" title="The host actual memory size, in GB" >Memory(GB):total</th>
<th align="left" title="The host inuse swap size, in GB" >Swap(GB):inuse</th>
- <th align="left" title="The host inuse swap size since the last heartbeat, in GB" >Swap(GB):delta</th>
<th align="left" title="The host free swap size, in GB" >Swap(GB):free</th>
<th align="left" title="The number of alien PIDs (those processes not associated with a user running jobs or having a reservation)" >Alien PIDs</th>
<th align="left" title="The number of system shares" >Shares:total</th>
@@ -139,7 +137,6 @@ if (table_style.equals("classic")) {
<th align="left" title="The host effective memory size, in GB (hint: specify this size to reserve entire machine)" >Memory(GB):usable</th>
<th align="left" title="The host actual memory size, in GB" >Memory(GB):total</th>
<th align="left" title="The host inuse swap size, in GB" >Swap(GB):inuse</th>
- <th align="left" title="The host inuse swap size since the last heartbeat, in GB" >Swap(GB):delta</th>
<th align="left" title="The host free swap size, in GB" >Swap(GB):free</th>
<th align="left" title="The number of alien PIDs (those processes not associated with a user running jobs or having a reservation)" >Alien PIDs</th>
<th align="left" title="The number of system shares" >Shares:total</th>