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 2018/03/12 23:31:41 UTC
svn commit: r1826599 - in
/uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent:
launcher/CGroupsManager.java metrics/collectors/NodeMemInfoCollector.java
metrics/collectors/NodeUsersCollector.java
Author: cwiklik
Date: Mon Mar 12 23:31:41 2018
New Revision: 1826599
URL: http://svn.apache.org/viewvc?rev=1826599&view=rev
Log:
UIMA-5744 when collecting user processes make sure user names are not being truncated. Modified to support names up to 32 chars long (which seems to be ssh max)
Modified:
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CGroupsManager.java
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/NodeMemInfoCollector.java
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/NodeUsersCollector.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=1826599&r1=1826598&r2=1826599&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 Mon Mar 12 23:31:41 2018
@@ -1189,7 +1189,7 @@ public class CGroupsManager {
try {
ProcessBuilder pb = new ProcessBuilder("ps", "-Ao",
- "user:12,pid,ppid,args,stat", "--no-heading");
+ "user:32,pid,ppid,args,stat", "--no-heading");
pb.redirectErrorStream(true);
java.lang.Process proc = pb.start();
// spawn ps command and scrape the output
Modified: uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/NodeMemInfoCollector.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/NodeMemInfoCollector.java?rev=1826599&r1=1826598&r2=1826599&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/NodeMemInfoCollector.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/NodeMemInfoCollector.java Mon Mar 12 23:31:41 2018
@@ -106,7 +106,7 @@ public class NodeMemInfoCollector implem
if ( Utils.isMac() ) {
pb = new ProcessBuilder("ps","-Ao","user=,pid=,uid=,rss=");
} else {
- pb = new ProcessBuilder("ps","-Ao","user:12,pid,uid,rss", "--no-heading");
+ pb = new ProcessBuilder("ps","-Ao","user:32,pid,uid,rss", "--no-heading");
}
pb.redirectErrorStream(true);
Process proc = pb.start();
Modified: uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/NodeUsersCollector.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/NodeUsersCollector.java?rev=1826599&r1=1826598&r2=1826599&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/NodeUsersCollector.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/metrics/collectors/NodeUsersCollector.java Mon Mar 12 23:31:41 2018
@@ -213,7 +213,7 @@ public class NodeUsersCollector implemen
if ( Utils.isMac() ) {
pb = new ProcessBuilder("ps","-Ao","user=,pid=,ppid=,uid=,args=");
} else {
- pb = new ProcessBuilder("ps","-Ao","user,pid,ppid,uid,args", "--no-heading");
+ pb = new ProcessBuilder("ps","-Ao","user:32,pid,ppid,uid,args", "--no-heading");
}
pb.redirectErrorStream(true);
Process proc = pb.start();