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

svn merge -r 1451340:1451341 Merging from trunk to branch-2 to fix YARN-269. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1451342 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Kihwal Lee 2013-02-28 21:04:10 +00:00
parent 07680cdb13
commit 4a4b0d9402
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -307,6 +307,9 @@ Release 0.23.7 - UNRELEASED
YARN-236. RM should point tracking URL to RM web page when app fails to YARN-236. RM should point tracking URL to RM web page when app fails to
start (Jason Lowe via jeagles) start (Jason Lowe via jeagles)
YARN-269. Resource Manager not logging the health_check_script result when
taking it out (Jason Lowe via kihwal)
OPTIMIZATIONS OPTIMIZATIONS
YARN-357. App submission should not be synchronized (daryn) YARN-357. App submission should not be synchronized (daryn)

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmnode/RMNodeImpl.java
View File

@ -498,6 +498,8 @@ public class RMNodeImpl implements RMNode, EventHandler<RMNodeEvent> {
statusEvent.getNodeHealthStatus(); statusEvent.getNodeHealthStatus();
rmNode.setNodeHealthStatus(remoteNodeHealthStatus); rmNode.setNodeHealthStatus(remoteNodeHealthStatus);
if (!remoteNodeHealthStatus.getIsNodeHealthy()) { if (!remoteNodeHealthStatus.getIsNodeHealthy()) {
LOG.info("Node " + rmNode.nodeId + " reported UNHEALTHY with details: "
+ remoteNodeHealthStatus.getHealthReport());
rmNode.nodeUpdateQueue.clear(); rmNode.nodeUpdateQueue.clear();
// Inform the scheduler // Inform the scheduler
rmNode.context.getDispatcher().getEventHandler().handle( rmNode.context.getDispatcher().getEventHandler().handle(