Repository: hadoop Updated Branches: refs/heads/branch-2 1e3476318 -> d3fc1bdde
YARN-5262. Optimize sending RMNodeFinishedContainersPulledByAMEvent for every AM heartbeat. (cherry picked from commit 26b5e6116f392b6be91dca57968259f87554ce33) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d3fc1bdd Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d3fc1bdd Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d3fc1bdd Branch: refs/heads/branch-2 Commit: d3fc1bddea2b6ffa94659cb80c3a144ecce69cd5 Parents: 1e34763 Author: Rohith Sharma K S <rohithsharm...@apache.org> Authored: Wed Jun 29 10:08:30 2016 +0530 Committer: Rohith Sharma K S <rohithsharm...@apache.org> Committed: Wed Jun 29 10:13:17 2016 +0530 ---------------------------------------------------------------------- .../resourcemanager/rmapp/attempt/RMAppAttemptImpl.java | 9 ++++++--- .../rmapp/attempt/TestRMAppAttemptTransitions.java | 7 +++++++ 2 files changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d3fc1bdd/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 ---------------------------------------------------------------------- diff --git a/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 b/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 index d210b53..9ec0f82 100644 --- a/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 +++ b/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 @@ -826,9 +826,11 @@ public class RMAppAttemptImpl implements RMAppAttempt, Recoverable { } } - finishedContainersSentToAM.putIfAbsent(nodeId, new ArrayList - <ContainerStatus>()); - finishedContainersSentToAM.get(nodeId).addAll(finishedContainers); + if (!finishedContainers.isEmpty()) { + finishedContainersSentToAM.putIfAbsent(nodeId, + new ArrayList<ContainerStatus>()); + finishedContainersSentToAM.get(nodeId).addAll(finishedContainers); + } } return returnList; @@ -1871,6 +1873,7 @@ public class RMAppAttemptImpl implements RMAppAttempt, Recoverable { eventHandler.handle(new RMNodeFinishedContainersPulledByAMEvent(nodeId, containerIdList)); } + this.finishedContainersSentToAM.clear(); } // Add am container to the list so that am container instance will be http://git-wip-us.apache.org/repos/asf/hadoop/blob/d3fc1bdd/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 ---------------------------------------------------------------------- diff --git a/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 b/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 index 3143b94..497c6d0 100644 --- a/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 +++ b/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 @@ -1444,6 +1444,13 @@ public class TestRMAppAttemptTransitions { Assert.assertTrue(applicationAttempt.getJustFinishedContainers().isEmpty()); Assert.assertEquals(0, getFinishedContainersSentToAM(applicationAttempt) .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( --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
