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:
Jason Lowe 2016-08-09 22:12:35 +00:00
parent bfc261f2a0
commit 5580626ea0
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,9 @@ Release 2.7.4 - UNRELEASED
OPTIMIZATIONS OPTIMIZATIONS
YARN-5262. Optimize sending RMNodeFinishedContainersPulledByAMEvent for
every AM heartbeat (Rohith Sharma K S via jlowe)
BUG FIXES BUG FIXES
YARN-5197. RM leaks containers if running container disappears from YARN-5197. RM leaks containers if running container disappears from

9
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

@ -763,9 +763,11 @@ public class RMAppAttemptImpl implements RMAppAttempt, Recoverable {
} }
} }
finishedContainersSentToAM.putIfAbsent(nodeId, new ArrayList if (!finishedContainers.isEmpty()) {
<ContainerStatus>()); finishedContainersSentToAM.putIfAbsent(nodeId,
finishedContainersSentToAM.get(nodeId).addAll(finishedContainers); new ArrayList<ContainerStatus>());
finishedContainersSentToAM.get(nodeId).addAll(finishedContainers);
}
} }
return returnList; return returnList;
@ -1713,6 +1715,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

@ -1427,6 +1427,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(