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/09/09 21:46:00 UTC
svn commit: r1702094 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws:
DuccMachinesData.java MachineSummaryInfo.java server/DuccHandler.java
Author: degenaro
Date: Wed Sep 9 19:46:00 2015
New Revision: 1702094
URL: http://svn.apache.org/r1702094
Log:
UIMA-4569 DUCC OR+WS expunge "shares" (and use memFree for utilization calculation)
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineSummaryInfo.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java?rev=1702094&r1=1702093&r2=1702094&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java Wed Sep 9 19:46:00 2015
@@ -53,7 +53,8 @@ public class DuccMachinesData {
private static ConcurrentSkipListMap<String,MachineInfo> unsortedMachines = new ConcurrentSkipListMap<String,MachineInfo>();
private static ConcurrentSkipListMap<String,MachineSummaryInfo> summaryMachines = new ConcurrentSkipListMap<String,MachineSummaryInfo>();
- private static AtomicLong memoryTotal = new AtomicLong(0);
+ private static AtomicLong memTotal = new AtomicLong(0);
+ private static AtomicLong memFree = new AtomicLong(0);
private static AtomicLong swapInuse = new AtomicLong(0);
private static AtomicLong swapFree = new AtomicLong(0);
@@ -153,7 +154,8 @@ public class DuccMachinesData {
public MachineSummaryInfo getTotals() {
MachineSummaryInfo totals = new MachineSummaryInfo();
- totals.memoryTotal = memoryTotal.get();
+ totals.memTotal = memTotal.get();
+ totals.memFree = memFree.get();
totals.swapInuse = swapInuse.get();
totals.swapFree = swapFree.get();
return totals;
@@ -163,13 +165,15 @@ public class DuccMachinesData {
if(summaryMachines.containsKey(ip.toString())) {
MachineSummaryInfo oldInfo = summaryMachines.get(ip.toString());
summaryMachines.put(ip.toString(), newInfo);
- memoryTotal.addAndGet(newInfo.memoryTotal-oldInfo.memoryTotal);
+ memTotal.addAndGet(newInfo.memTotal-oldInfo.memTotal);
+ memFree.addAndGet(newInfo.memFree-oldInfo.memFree);
swapInuse.addAndGet(newInfo.swapInuse-oldInfo.swapInuse);
swapFree.addAndGet(newInfo.swapFree-oldInfo.swapFree);
}
else {
summaryMachines.put(ip.toString(), newInfo);
- memoryTotal.addAndGet(newInfo.memoryTotal);
+ memTotal.addAndGet(newInfo.memTotal);
+ memFree.addAndGet(newInfo.memFree);
swapInuse.addAndGet(newInfo.swapInuse);
swapFree.addAndGet(newInfo.swapFree);
}
@@ -215,12 +219,13 @@ public class DuccMachinesData {
long nodeMemTotal = nodeMetrics.getNodeMemory().getMemTotal();
logger.debug(location, jobid, "node: "+machineName+" "+"memTotal: "+nodeMemTotal);
long lvalMemTotal = (long) ((1.0*nodeMemTotal)/(1024*1024)+0.5);
- msi.memoryTotal = lvalMemTotal;
+ msi.memTotal = lvalMemTotal;
String memTotal = ""+lvalMemTotal/*+memUnits*/;
// mem: free
long nodeMemFree = nodeMetrics.getNodeMemory().getMemFree();
logger.debug(location, jobid, "node: "+machineName+" "+"memFree: "+nodeMemFree);
long lvalMemFree = (long) ((1.0*nodeMemFree)/(1024*1024)+0.0); // do NOT round up!
+ msi.memFree = lvalMemFree;
String memFree = ""+lvalMemFree/*+memUnits*/;
// swap: in-usewell
double dvalSwapTotal = nodeMetrics.getNodeMemory().getSwapTotal();
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineSummaryInfo.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineSummaryInfo.java?rev=1702094&r1=1702093&r2=1702094&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineSummaryInfo.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/MachineSummaryInfo.java Wed Sep 9 19:46:00 2015
@@ -20,7 +20,8 @@ package org.apache.uima.ducc.ws;
public class MachineSummaryInfo {
- public long memoryTotal = 0;
+ public long memTotal = 0;
+ public long memFree = 0;
public long swapInuse = 0;
public long swapFree = 0;
}
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=1702094&r1=1702093&r2=1702094&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 Wed Sep 9 19:46:00 2015
@@ -3644,11 +3644,11 @@ public class DuccHandler extends DuccAbs
String utilization = "0%";
- long memoryTotal = msi.memoryTotal * GB;
- long memoryInuse = DuccData.getInstance().getLive().getMemoryInuse();
+ long memFree = msi.memFree * GB;
+ long memInuse = DuccData.getInstance().getLive().getMemoryInuse();
- if(memoryTotal > 0) {
- double percentage = (((1.0) * memoryInuse) / ((1.0) * memoryTotal)) * 100.0;
+ if(memFree > 0) {
+ double percentage = (((1.0) * memInuse) / ((1.0) * memFree)) * 100.0;
utilization = percentageFormatter.format(percentage)+"%";
}