From 34a3900773df6d9075dcf5476e8fe5208cd8f806 Mon Sep 17 00:00:00 2001
From: rohithsharmaks <rohithsharmaks@apache.org>
Date: Fri, 22 Jan 2016 21:17:26 +0530
Subject: [PATCH] YARN-4574. Fix random failure in TestAMRMClientOnRMRestart.
 (Takashi Ohnishi via rohithsharmaks)

---
 hadoop-yarn-project/CHANGES.txt                                | 3 +++
 .../hadoop/yarn/client/api/impl/TestAMRMClientOnRMRestart.java | 1 +
 2 files changed, 4 insertions(+)

diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index b667b5bed8b..a4f9874781c 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -146,6 +146,9 @@ Release 2.9.0 - UNRELEASED
     YARN-4497. RM might fail to restart when recovering apps whose attempts are missing.
     (Jun Gong via rohithsharmaks)
 
+    YARN-4574. Fix random failure in TestAMRMClientOnRMRestart.
+    (Takashi Ohnishi via rohithsharmaks)
+
 Release 2.8.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClientOnRMRestart.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClientOnRMRestart.java
index 0460f1ef71b..0890396bccd 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClientOnRMRestart.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClientOnRMRestart.java
@@ -219,6 +219,7 @@ public class TestAMRMClientOnRMRestart {
     // request
     nm1.nodeHeartbeat(containerId.getApplicationAttemptId(),
         containerId.getContainerId(), ContainerState.RUNNING);
+    dispatcher.await();
     amClient.requestContainerResourceChange(
         container, Resource.newInstance(2048, 1));
     it.remove();