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

Merge -r 1414646:1414647 from trunk to branch-2. Fixes: YARN-224. Fair scheduler logs too many nodeUpdate INFO messages. Contributed by Sandy Ryza. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1414648 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas White 2012-11-28 12:28:35 +00:00
parent e34575d076
commit 0e1b19a111
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,6 +89,9 @@ Release 2.0.3-alpha - Unreleased
YARN-184. Remove unnecessary locking in fair scheduler, and address YARN-184. Remove unnecessary locking in fair scheduler, and address
findbugs excludes. (sandyr via tucu) findbugs excludes. (sandyr via tucu)
YARN-224. Fair scheduler logs too many nodeUpdate INFO messages.
(Sandy Ryza via tomwhite)
Release 2.0.2-alpha - 2012-09-07 Release 2.0.2-alpha - 2012-09-07
YARN-9. Rename YARN_HOME to HADOOP_YARN_HOME. (vinodkv via acmurthy) YARN-9. Rename YARN_HOME to HADOOP_YARN_HOME. (vinodkv via acmurthy)

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
View File

@ -723,7 +723,9 @@ public class FairScheduler implements ResourceScheduler {
private synchronized void nodeUpdate(RMNode nm, private synchronized void nodeUpdate(RMNode nm,
List<ContainerStatus> newlyLaunchedContainers, List<ContainerStatus> newlyLaunchedContainers,
List<ContainerStatus> completedContainers) { List<ContainerStatus> completedContainers) {
LOG.info("nodeUpdate: " + nm + " cluster capacity: " + clusterCapacity); if (LOG.isDebugEnabled()) {
LOG.debug("nodeUpdate: " + nm + " cluster capacity: " + clusterCapacity);
}
eventLog.log("HEARTBEAT", nm.getHostName()); eventLog.log("HEARTBEAT", nm.getHostName());
FSSchedulerNode node = nodes.get(nm.getNodeID()); FSSchedulerNode node = nodes.get(nm.getNodeID());