Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jian He 2014-06-11 18:32:48 +00:00
parent e4f775755c
commit 279c5a3752
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -143,6 +143,9 @@ Release 2.5.0 - UNRELEASED
YARN-2091. Add more values to ContainerExitStatus and pass it from NM to YARN-2091. Add more values to ContainerExitStatus and pass it from NM to
RM and then to app masters (Tsuyoshi OZAWA via bikas) 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 OPTIMIZATIONS
BUG FIXES BUG FIXES

4
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
View File

@ -208,7 +208,9 @@ private void containerBasedPreemptOrKill(CSQueue root,
Map<ApplicationAttemptId,Set<RMContainer>> toPreempt = Map<ApplicationAttemptId,Set<RMContainer>> toPreempt =
getContainersToPreempt(queues, clusterResources); getContainersToPreempt(queues, clusterResources);
if (LOG.isDebugEnabled()) {
logToCSV(queues); logToCSV(queues);
}
// if we are in observeOnly mode return before any action is taken // if we are in observeOnly mode return before any action is taken
if (observeOnly) { if (observeOnly) {
@ -608,7 +610,7 @@ public int compare(TempQueue o1, TempQueue o2) {
sb.append(", "); sb.append(", ");
tq.appendLogString(sb); tq.appendLogString(sb);
} }
LOG.info(sb.toString()); LOG.debug(sb.toString());
} }
/** /**