Merge -c 1190495 from trunk to branch-0.23 to fix MAPREDUCE-3304.

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

hadoop-mapreduce-project/CHANGES.txt

@@ -1789,6 +1789,9 @@ Release 0.23.0 - Unreleased
     MAPREDUCE-2775. Fixed ResourceManager and NodeManager to force a
     decommissioned node to shutdown. (Devaraj K via vinodkv)
 
+    MAPREDUCE-3304. Fixed intermittent test failure due to a race in
+    TestRMContainerAllocator#testBlackListedNodes. (Ravi Prakash via acmurthy) 
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRMContainerAllocator.java

@@ -567,6 +567,7 @@ public class TestRMContainerAllocator {
     Assert.assertEquals("No of assignments must be 0", 0, assigned.size());    
 
     nodeManager3.nodeHeartbeat(true); // Node heartbeat
+    dispatcher.await();
     assigned = allocator.schedule();    
     dispatcher.await();