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/25 14:37:25 UTC
svn commit: r1766541 -
/uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CGroupsManager.java
Author: cwiklik
Date: Tue Oct 25 14:37:24 2016
New Revision: 1766541
URL: http://svn.apache.org/viewvc?rev=1766541&view=rev
Log:
UIMA-5047 Modified how CPU usage is collected
Modified:
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CGroupsManager.java
Modified: uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CGroupsManager.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CGroupsManager.java?rev=1766541&r1=1766540&r2=1766541&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CGroupsManager.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CGroupsManager.java Tue Oct 25 14:37:24 2016
@@ -57,7 +57,7 @@ public class CGroupsManager {
private static final String CGDuccMemoryPath = "/memory/"+SYSTEM+"/";
private static final String CGDuccCpuPath = "/cpu/"+SYSTEM+"/";
private static final String CGProcsFile = "/cgroup.procs";
- private static final String CGDuccCpuAcctPath = "/cpu/"+SYSTEM+"/";
+// private static final String CGDuccCpuAcctPath = "/cpu/"+SYSTEM+"/";
// legacy means that the cgonfig points to <cgroup location>/ducc
private boolean legacyCgConfig = false;
@@ -492,7 +492,6 @@ public class CGroupsManager {
public long getCpuUsage(String containerId ) throws Exception {
long usage = 0;
-// String file = getCGroupLocation("cpuacct")+containerId+System.getProperty("file.separator")+"cpuacct.stat";
String file = getCGroupLocation("cpuacct")+containerId+System.getProperty("file.separator")+"cpuacct.usage";
agentLogger.trace("getCpuUsage", null, "CPUACCT.USAGE file:"+file);
File f = new File(file);
@@ -501,18 +500,8 @@ public class CGroupsManager {
BufferedReader br = new BufferedReader(isr);
String line;
try {
-// String cpu;
while ((line = br.readLine()) != null) {
agentLogger.trace("getCpuUsage", null, "CPUACCT.USAGE Line:"+line);
-/*
- // The line read from cpuacct.stat has: NAME VALUE syntax.
- // Need just the VALUE part
- if ( line.trim().length() > 0 ) {
- cpu = (line.trim().split(" "))[1]; // get the CPU in user mode
- // convert to long and accumulate. Need cpu both in user and system mode
- usage += Long.parseLong(cpu);
- }
- */
usage = Long.parseLong(line.trim());
break;
}