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

YARN-5262. Optimize sending RMNodeFinishedContainersPulledByAMEvent for every AM heartbeat. Contributed by Rohith Sharma K S 

(cherry picked from commit 26b5e6116f)
This commit is contained in:
Rohith Sharma K S 2016-06-29 10:08:30 +05:30 committed by Jason Lowe
parent 5ea35b2af2
commit 3b4d6ece1a
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java
View File

@ -823,10 +823,12 @@ public class RMAppAttemptImpl implements RMAppAttempt, Recoverable {
} }
} }
finishedContainersSentToAM.putIfAbsent(nodeId, new ArrayList if (!finishedContainers.isEmpty()) {
<ContainerStatus>()); finishedContainersSentToAM.putIfAbsent(nodeId,
new ArrayList<ContainerStatus>());
finishedContainersSentToAM.get(nodeId).addAll(finishedContainers); finishedContainersSentToAM.get(nodeId).addAll(finishedContainers);
} }
}
return returnList; return returnList;
} finally { } finally {
@ -1841,6 +1843,7 @@ public class RMAppAttemptImpl implements RMAppAttempt, Recoverable {
eventHandler.handle(new RMNodeFinishedContainersPulledByAMEvent(nodeId, eventHandler.handle(new RMNodeFinishedContainersPulledByAMEvent(nodeId,
containerIdList)); containerIdList));
} }
this.finishedContainersSentToAM.clear();
} }
// Add am container to the list so that am container instance will be // Add am container to the list so that am container instance will be

7
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java
View File

@ -1444,6 +1444,13 @@ public class TestRMAppAttemptTransitions {
Assert.assertTrue(applicationAttempt.getJustFinishedContainers().isEmpty()); Assert.assertTrue(applicationAttempt.getJustFinishedContainers().isEmpty());
Assert.assertEquals(0, getFinishedContainersSentToAM(applicationAttempt) Assert.assertEquals(0, getFinishedContainersSentToAM(applicationAttempt)
.size()); .size());
// verify if no containers to acknowledge to NM then event should not be
// triggered. Number of times event invoked is 1 i.e on second pull
containerStatuses = applicationAttempt.pullJustFinishedContainers();
Assert.assertEquals(0, containerStatuses.size());
Mockito.verify(rmnodeEventHandler, times(1))
.handle(Mockito.any(RMNodeEvent.class));
} }
private static List<ContainerStatus> getFinishedContainersSentToAM( private static List<ContainerStatus> getFinishedContainersSentToAM(