From 711f8cb891bc85d8b2c2bf6b8b351ce7f3fcef39 Mon Sep 17 00:00:00 2001 From: Rohith Sharma K S Date: Fri, 17 Jun 2016 09:28:37 +0530 Subject: [PATCH] YARN-5262 --- .../server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java | 9 ++++++--- .../rmapp/attempt/TestRMAppAttemptTransitions.java | 7 +++++++ 2 files changed, 13 insertions(+), 3 deletions(-) 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 float getProgress() { } } - finishedContainersSentToAM.putIfAbsent(nodeId, new ArrayList - ()); - finishedContainersSentToAM.get(nodeId).addAll(finishedContainers); + if (!finishedContainers.isEmpty()) { + finishedContainersSentToAM.putIfAbsent(nodeId, + new ArrayList()); + finishedContainersSentToAM.get(nodeId).addAll(finishedContainers); + } } return returnList; @@ -1871,6 +1873,7 @@ private void sendFinishedContainersToNM() { eventHandler.handle(new RMNodeFinishedContainersPulledByAMEvent(nodeId, containerIdList)); } + this.finishedContainersSentToAM.clear(); } // Add am container to the list so that am container instance will be 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 void testFinishedContainer() { 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 getFinishedContainersSentToAM( -- 1.9.2.msysgit.0