Author: jianhe
Date: Wed Jun 11 18:32:48 2014
New Revision: 1601981
URL: http://svn.apache.org/r1601981
Log:
Merge r1601980 from trunk. YARN-2125. Changed
ProportionalCapacityPreemptionPolicy to log CSV in debug level. Contributed by
Wangda Tan
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2/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
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1601981&r1=1601980&r2=1601981&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Wed Jun 11
18:32:48 2014
@@ -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
Modified:
hadoop/common/branches/branch-2/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
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/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?rev=1601981&r1=1601980&r2=1601981&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/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
(original)
+++
hadoop/common/branches/branch-2/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
Wed Jun 11 18:32:48 2014
@@ -208,7 +208,9 @@ public class ProportionalCapacityPreempt
Map<ApplicationAttemptId,Set<RMContainer>> 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 class ProportionalCapacityPreempt
sb.append(", ");
tq.appendLogString(sb);
}
- LOG.info(sb.toString());
+ LOG.debug(sb.toString());
}
/**
