Merge r1490440 from branch-2 to branch-2.1-beta for YARN-761. TestNMClientAsync fails sometimes (Zhijie Shen via bikas)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1490444 13f79535-47bb-0310-9956-ffa450edef68

hadoop-yarn-project/CHANGES.txt

@@ -254,6 +254,9 @@ Release 2.1.0-beta - UNRELEASED
     YARN-756. Move Preemption* records to yarn.api where they really belong.
     (Jian He via vinodkv)
 
+    YARN-750. Allow for black-listing resources in YARN API and Impl in CS
+    (acmurthy via bikas)
+
   OPTIMIZATIONS
 
     YARN-512. Log aggregation root directory check is more expensive than it
@@ -425,6 +428,8 @@ Release 2.1.0-beta - UNRELEASED
     YARN-764. blank Used Resources on Capacity Scheduler page (Nemon Lou via
     tgraves)
 
+    YARN-761. TestNMClientAsync fails sometimes (Zhijie Shen via bikas)
+
   BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS
 
     YARN-158. Yarn creating package-info.java must not depend on sh.

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestNMClientAsync.java

@@ -121,8 +121,11 @@ public class TestNMClientAsync {
     }
     Assert.assertEquals("Error occurs in ContainerEventProcessor", 0,
         ((MockNMClientAsync1) asyncClient).errorMsgs.size());
-    Assert.assertEquals("Completed container is not removed", 0,
-        asyncClient.containers.size());
+    // When the callback functions are all executed, the event processor threads
+    // may still not terminate and the containers may still not removed.
+    while (asyncClient.containers.size() > 0) {
+      Thread.sleep(10);
+    }
     asyncClient.stop();
     Assert.assertFalse(
         "The thread of Container Management Event Dispatcher is still alive",