From 279c5a3752112235631824459f81086e3bbe670e Mon Sep 17 00:00:00 2001 From: Jian He Date: Wed, 11 Jun 2014 18:32:48 +0000 Subject: [PATCH] Merge r1601980 from trunk. YARN-2125. Changed ProportionalCapacityPreemptionPolicy to log CSV in debug level. Contributed by Wangda Tan git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601981 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../capacity/ProportionalCapacityPreemptionPolicy.java | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 6cc09c3e32c..44c2bda6bc3 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -143,6 +143,9 @@ Release 2.5.0 - UNRELEASED YARN-2091. Add more values to ContainerExitStatus and pass it from NM to RM and then to app masters (Tsuyoshi OZAWA via bikas) + YARN-2125. Changed ProportionalCapacityPreemptionPolicy to log CSV in debug + level. (Wangda Tan via jianhe) + OPTIMIZATIONS BUG FIXES diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicy.java index 6d1516158b5..568c5abbc01 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicy.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/capacity/ProportionalCapacityPreemptionPolicy.java @@ -208,7 +208,9 @@ private void containerBasedPreemptOrKill(CSQueue root, Map> toPreempt = getContainersToPreempt(queues, clusterResources); - logToCSV(queues); + if (LOG.isDebugEnabled()) { + logToCSV(queues); + } // if we are in observeOnly mode return before any action is taken if (observeOnly) { @@ -608,7 +610,7 @@ public int compare(TempQueue o1, TempQueue o2) { sb.append(", "); tq.appendLogString(sb); } - LOG.info(sb.toString()); + LOG.debug(sb.toString()); } /**