You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by jl...@apache.org on 2015/07/01 19:51:09 UTC

hadoop git commit: MAPREDUCE-6420. Interrupted Exception in LocalContainerLauncher should be logged in warn/info level. Contributed by Chang Li (cherry picked from commit 826715622e6937887a4e20b3ce327d7e2fd89009)

Repository: hadoop
Updated Branches:
  refs/heads/branch-2 d38f377cd -> f3195eda2


MAPREDUCE-6420. Interrupted Exception in LocalContainerLauncher should be logged in warn/info level. Contributed by Chang Li
(cherry picked from commit 826715622e6937887a4e20b3ce327d7e2fd89009)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f3195eda
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f3195eda
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f3195eda

Branch: refs/heads/branch-2
Commit: f3195eda27706e55ae371c0712f4eac02236c53f
Parents: d38f377
Author: Jason Lowe <jl...@apache.org>
Authored: Wed Jul 1 17:50:02 2015 +0000
Committer: Jason Lowe <jl...@apache.org>
Committed: Wed Jul 1 17:50:47 2015 +0000

----------------------------------------------------------------------
 hadoop-mapreduce-project/CHANGES.txt                              | 3 +++
 .../java/org/apache/hadoop/mapred/LocalContainerLauncher.java     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/f3195eda/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index c21483a..47998b9 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -257,6 +257,9 @@ Release 2.8.0 - UNRELEASED
     MAPREDUCE-6121. JobResourceUpdater#compareFs() doesn't handle HA namespaces
     (rchiang via rkanter)
 
+    MAPREDUCE-6420. Interrupted Exception in LocalContainerLauncher should be
+    logged in warn/info level (Chang Li via jlowe)
+
 Release 2.7.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/f3195eda/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/LocalContainerLauncher.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/LocalContainerLauncher.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/LocalContainerLauncher.java
index 9d8b4a5..1a0d5fb 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/LocalContainerLauncher.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/LocalContainerLauncher.java
@@ -233,7 +233,7 @@ public class LocalContainerLauncher extends AbstractService implements
         try {
           event = eventQueue.take();
         } catch (InterruptedException e) {  // mostly via T_KILL? JOB_KILL?
-          LOG.error("Returning, interrupted : " + e);
+          LOG.warn("Returning, interrupted : " + e);
           break;
         }