From 1ee0c23b3970f55e556af0efba06cb338b3c8c49 Mon Sep 17 00:00:00 2001 From: Robert Joseph Evans Date: Tue, 21 Aug 2012 17:47:08 +0000 Subject: [PATCH] svn merge -c 1375687 FIXES: MAPREDUCE-4570. ProcfsBasedProcessTree#constructProcessInfo() prints a warning if procfsDir//stat is not found. (Ahmed Radwan via bobby) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1375691 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../apache/hadoop/mapreduce/util/ProcfsBasedProcessTree.java | 2 +- .../org/apache/hadoop/yarn/util/ProcfsBasedProcessTree.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 1031a5ac905..59a27d6cd9d 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -697,6 +697,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//stat is not found. (Ahmed Radwan via bobby) + Release 0.23.2 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ProcfsBasedProcessTree.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ProcfsBasedProcessTree.java index 1d02ca55594..583e95d8d10 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ProcfsBasedProcessTree.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/util/ProcfsBasedProcessTree.java @@ -512,7 +512,7 @@ public class ProcfsBasedProcessTree extends ProcessTree { 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; } 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 db65ad20cb8..ca0f7e4c907 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 @@ -410,7 +410,7 @@ public class ProcfsBasedProcessTree { 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; }