From cf74772064de0ce7cefd541e3f407442f4f0e281 Mon Sep 17 00:00:00 2001 From: Allen Wittenauer Date: Tue, 21 Jul 2015 10:58:52 -0700 Subject: [PATCH] MAPREDUCE-5801. Uber mode's log message is missing a vcore reason (Steven Wong via aw) --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java | 2 ++ 2 files changed, 5 insertions(+) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 31f4eaa809..398ffc667b 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -270,6 +270,9 @@ Trunk (Unreleased) MAPREDUCE-6078. native-task: fix gtest build on macosx (Binglin Chang) + MAPREDUCE-5801. Uber mode's log message is missing a vcore reason + (Steven Wong via aw) + Release 2.8.0 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java index 731bcba9d1..4c3b3fed27 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java @@ -1289,6 +1289,8 @@ private void makeUberDecision(long dataInputLength) { msg.append(" too much CPU;"); if (!smallMemory) msg.append(" too much RAM;"); + if (!smallCpu) + msg.append(" too much CPU;"); if (!notChainJob) msg.append(" chainjob;"); LOG.info(msg.toString());