diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ProcfsBasedProcessTree.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ProcfsBasedProcessTree.java index 4fb4be3..6fb62ec 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ProcfsBasedProcessTree.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ProcfsBasedProcessTree.java @@ -57,10 +57,10 @@ private static final String PROCFS = "/proc/"; - private static final Pattern PROCFS_STAT_FILE_FORMAT = Pattern .compile( - "^([0-9-]+)\\s([^\\s]+)\\s[^\\s]\\s([0-9-]+)\\s([0-9-]+)\\s([0-9-]+)\\s" + - "([0-9-]+\\s){7}([0-9]+)\\s([0-9]+)\\s([0-9-]+\\s){7}([0-9]+)\\s([0-9]+)" + - "(\\s[0-9-]+){15}"); + private static final Pattern PROCFS_STAT_FILE_FORMAT = Pattern.compile( + "^([\\d-]+)\\s\\(([^\\)]+)\\)\\s[^\\s]\\s([\\d-]+)\\s([\\d-]+)\\s" + + "([\\d-]+)\\s([\\d-]+\\s){7}(\\d+)\\s(\\d+)\\s([\\d-]+\\s){7}(\\d+)\\s" + + "(\\d+)(\\s[\\d-]+){15}"); public static final String PROCFS_STAT_FILE = "stat"; public static final String PROCFS_CMDLINE_FILE = "cmdline"; @@ -537,8 +537,9 @@ private static ProcessInfo constructProcessInfo(ProcessInfo pinfo, Matcher m = PROCFS_STAT_FILE_FORMAT.matcher(str); boolean mat = m.find(); if (mat) { + String processName = "(" + m.group(2) + ")"; // Set (name) (ppid) (pgrpId) (session) (utime) (stime) (vsize) (rss) - pinfo.updateProcessInfo(m.group(2), m.group(3), + pinfo.updateProcessInfo(processName, m.group(3), Integer.parseInt(m.group(4)), Integer.parseInt(m.group(5)), Long.parseLong(m.group(7)), new BigInteger(m.group(8)), Long.parseLong(m.group(10)), Long.parseLong(m.group(11))); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestProcfsBasedProcessTree.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestProcfsBasedProcessTree.java index 6fbbfbe..c093ab4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestProcfsBasedProcessTree.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/util/TestProcfsBasedProcessTree.java @@ -417,7 +417,7 @@ public void testCpuAndMemoryForProcessTree() throws IOException { new ProcessStatInfo(new String[] { "100", "proc1", "1", "100", "100", "100000", "100", "1000", "200" }); procInfos[1] = - new ProcessStatInfo(new String[] { "200", "proc2", "100", "100", + new ProcessStatInfo(new String[] { "200", "process two", "100", "100", "100", "200000", "200", "2000", "400" }); procInfos[2] = new ProcessStatInfo(new String[] { "300", "proc3", "200", "100", @@ -484,7 +484,7 @@ public void testCpuAndMemoryForProcessTree() throws IOException { new ProcessStatInfo(new String[] { "100", "proc1", "1", "100", "100", "100000", "100", "2000", "300" }); procInfos[1] = - new ProcessStatInfo(new String[] { "200", "proc2", "100", "100", + new ProcessStatInfo(new String[] { "200", "process two", "100", "100", "100", "200000", "200", "3000", "500" }); writeStatFiles(procfsRootDir, pids, procInfos, memInfo); @@ -561,7 +561,7 @@ private void testMemForOlderProcesses(boolean smapEnabled) throws IOException { new ProcessStatInfo(new String[] { "100", "proc1", "1", "100", "100", "100000", "100" }); procInfos[1] = - new ProcessStatInfo(new String[] { "200", "proc2", "100", "100", + new ProcessStatInfo(new String[] { "200", "process two", "100", "100", "100", "200000", "200" }); procInfos[2] = new ProcessStatInfo(new String[] { "300", "proc3", "1", "300", "300", @@ -807,7 +807,7 @@ public void testProcessTreeDump() throws IOException { new ProcessStatInfo(new String[] { "100", "proc1", "1", "100", "100", "100000", "100", "1000", "200" }); procInfos[1] = - new ProcessStatInfo(new String[] { "200", "proc2", "100", "100", + new ProcessStatInfo(new String[] { "200", "process two", "100", "100", "100", "200000", "200", "2000", "400" }); procInfos[2] = new ProcessStatInfo(new String[] { "300", "proc3", "200", "100", @@ -832,7 +832,7 @@ public void testProcessTreeDump() throws IOException { String[] cmdLines = new String[numProcesses]; cmdLines[0] = "proc1 arg1 arg2"; - cmdLines[1] = "proc2 arg3 arg4"; + cmdLines[1] = "process two arg3 arg4"; cmdLines[2] = "proc3 arg5 arg6"; cmdLines[3] = "proc4 arg7 arg8"; cmdLines[4] = "proc5 arg9 arg10";