From 826715622e6937887a4e20b3ce327d7e2fd89009 Mon Sep 17 00:00:00 2001 From: Jason Lowe Date: Wed, 1 Jul 2015 17:50:02 +0000 Subject: [PATCH] MAPREDUCE-6420. Interrupted Exception in LocalContainerLauncher should be logged in warn/info level. Contributed by Chang Li --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/mapred/LocalContainerLauncher.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 409f074752..dd9da7e812 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -524,6 +524,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 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 9d8b4a5abd..1a0d5fb076 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 void run() { try { event = eventQueue.take(); } catch (InterruptedException e) { // mostly via T_KILL? JOB_KILL? - LOG.error("Returning, interrupted : " + e); + LOG.warn("Returning, interrupted : " + e); break; }