Author: bobby
Date: Tue Aug 21 17:47:51 2012
New Revision: 1375693
URL: http://svn.apache.org/viewvc?rev=1375693&view=rev
Log:
svn merge -c 1375687 FIXES: MAPREDUCE-4570.
ProcfsBasedProcessTree#constructProcessInfo() prints a warning if
procfsDir/<pid>/stat is not found. (Ahmed Radwan via bobby)
Modified:
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ProcfsBasedProcessTree.java
Modified:
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/CHANGES.txt?rev=1375693&r1=1375692&r2=1375693&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/CHANGES.txt
Tue Aug 21 17:47:51 2012
@@ -590,6 +590,9 @@ Release 0.23.3 - UNRELEASED
MAPREDUCE-3506. Calling getPriority on JobInfo after parsing a history log
with JobHistoryParser throws a NullPointerException (Jason Lowe via bobby)
+ MAPREDUCE-4570. ProcfsBasedProcessTree#constructProcessInfo() prints a
+ warning if procfsDir/<pid>/stat is not found. (Ahmed Radwan via bobby)
+
Release 0.23.2 - UNRELEASED
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ProcfsBasedProcessTree.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ProcfsBasedProcessTree.java?rev=1375693&r1=1375692&r2=1375693&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ProcfsBasedProcessTree.java
(original)
+++
hadoop/common/branches/branch-2.1.0-alpha/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ProcfsBasedProcessTree.java
Tue Aug 21 17:47:51 2012
@@ -512,7 +512,7 @@ public class ProcfsBasedProcessTree exte
in = new BufferedReader(fReader);
} catch (FileNotFoundException f) {
// The process vanished in the interim!
- LOG.warn("The process " + pinfo.getPid()
+ LOG.info("The process " + pinfo.getPid()
+ " may have finished in the interim.");
return ret;
}
