You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2016/10/26 13:52:14 UTC
svn commit: r1766684 - in /uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent: NodeAgent.java processors/LinuxNodeMetricsProcessor.java

Author: cwiklik
Date: Wed Oct 26 13:52:14 2016
New Revision: 1766684

URL: http://svn.apache.org/viewvc?rev=1766684&view=rev
Log:
UIMA-5047 Fix NPE when cgroups are not configured and agent tries to determine if CPU reporting is available

Modified:
    uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java
    uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxNodeMetricsProcessor.java

Modified: uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java?rev=1766684&r1=1766683&r2=1766684&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java Wed Oct 26 13:52:14 2016
@@ -222,8 +222,6 @@ public class NodeAgent extends AbstractD
     // fetch Page Size from the OS and cache it
     pageSize = getOSPageSize();
     
-    // begin publishing node metrics
-    factory.startNodeMetrics(this);
     
     numProcessors = getNodeProcessors();
     
@@ -373,6 +371,10 @@ public class NodeAgent extends AbstractD
       logger.info("nodeAgent", null, "------- CGroups Not Enabled on this Machine");
       cgroupFailureReason = "------- CGroups Not Enabled on this Machine - check ducc.properties: ducc.agent.launcher.cgroups.enable ";
     }
+    
+    // begin publishing node metrics
+    factory.startNodeMetrics(this);
+
     logger.info("nodeAgent", null, "CGroup Support=" + useCgroups + " excludeNodeFromCGroups="
             + excludeNodeFromCGroups + " excludeAPs=" + excludeAPs+" CGroups utils Dir:"+cgUtilsPath);
 

Modified: uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxNodeMetricsProcessor.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxNodeMetricsProcessor.java?rev=1766684&r1=1766683&r2=1766684&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxNodeMetricsProcessor.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxNodeMetricsProcessor.java Wed Oct 26 13:52:14 2016
@@ -153,7 +153,10 @@ public class LinuxNodeMetricsProcessor e
 				users = new TreeMap<String, NodeUsersInfo>();
 			}
 			NodeLoadAverage lav = loadFuture.get();
-			boolean cpuReportingEnabled = agent.cgroupsManager.isCpuReportingEnabled();
+			boolean cpuReportingEnabled = false;
+			if ( agent.cgroupsManager != null ) {
+				cpuReportingEnabled = agent.cgroupsManager.isCpuReportingEnabled();
+			}
             NodeMetrics nodeMetrics = new NodeMetrics(agent.getIdentity(), memInfo, lav,
               cpuInfo, users, cpuReportingEnabled);