svn commit: r1746317 - /uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java

[degenaro]

Author: degenaro
Date: Tue May 31 18:43:26 2016
New Revision: 1746317

URL: http://svn.apache.org/viewvc?rev=1746317&view=rev
Log:
UIMA-4948 Agent should use uptime cmd to collect node average CPU load

On Machines page WS:

- employ getNodeMetrics().getNodeLoadAverage().getLoadAverage1()

Modified:
    
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.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=1746317&r1=1746316&r2=1746317&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
 Tue May 31 18:43:26 2016
@@ -317,12 +317,12 @@ public class DuccMachinesData {
                }
        }
        
-       private double getCpu(Node node) {
-               String location = "getCpu";
+       private double getCpuLoadAvg(Node node) {
+               String location = "getCpuLoadAvg";
                double cpu = 0;
                try {
                        if(node != null) {
-                               String load = 
node.getNodeMetrics().getNodeCpu().getCurrentLoad();
+                               String load = 
node.getNodeMetrics().getNodeLoadAverage().getLoadAvg1();
                                cpu = ConvertSafely.String2Double(load);
                        }
                }
@@ -391,7 +391,7 @@ public class DuccMachinesData {
                String swapFree = ""+lvalSwapFree/*+memUnits*/;
                List<ProcessInfo> alienPids = 
nodeMetrics.getRogueProcessInfoList();
                Node node = nodeMetrics.getNode();
-               double cpu = getCpu(node);
+               double cpu = getCpuLoadAvg(node);
                boolean cGroups = nodeMetrics.getCgroups();
                MachineInfo current = new MachineInfo("", ip.toString(), 
machineName, memTotal, memFree, ""+swapInuse, ""+swapFree, cpu, cGroups, 
alienPids, duccEvent.getMillis(), duccEvent.getEventSize());