From fc4ed3ca7b1b9a89539b4df56392c081573038b5 Mon Sep 17 00:00:00 2001 From: Arun Murthy Date: Tue, 31 Jan 2012 06:23:32 +0000 Subject: [PATCH] Merge -c 1238157 from trunk to branch-0.23 to fix MAPREDUCE-3748. Changed a log in CapacityScheduler.nodeUpdate to debug. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1238159 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../scheduler/capacity/CapacityScheduler.java | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 3317a0c900d..96d40231a3e 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -573,6 +573,9 @@ Release 0.23.1 - Unreleased java.io.File.createTempFile to create temporary files as part of their tasks. (Jonathan Eagles via vinodkv) + MAPREDUCE-3748. Changed a log in CapacityScheduler.nodeUpdate to debug. + (ramya via acmurthy) + Release 0.23.0 - 2011-11-01 INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java index 1dd92a74070..aa7d23ed91e 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java @@ -531,8 +531,10 @@ implements ResourceScheduler, CapacitySchedulerContext { private synchronized void nodeUpdate(RMNode nm, List newlyLaunchedContainers, List completedContainers) { - LOG.info("nodeUpdate: " + nm + " clusterResources: " + clusterResource); - + if (LOG.isDebugEnabled()) { + LOG.debug("nodeUpdate: " + nm + " clusterResources: " + clusterResource); + } + SchedulerNode node = getNode(nm.getNodeID()); // Processing the newly launched containers