svn merge -c 1565505 merging from trunk to branch-2 to fix:HDFS-5807. TestBalancerWithNodeGroup.testBalancerWithNodeGroup fails intermittently.

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

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -59,6 +59,9 @@ Release 2.4.0 - UNRELEASED
     HDFS-5895. HDFS cacheadmin -listPools has exit_code of 1 when the command
     returns 0 result. (Tassapol Athiapinya via cnauroth)
 
+    HDFS-5807. TestBalancerWithNodeGroup.testBalancerWithNodeGroup fails
+    intermittently. (Chen He via kihwal)
+
 Release 2.3.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/balancer/TestBalancerWithNodeGroup.java

@@ -65,7 +65,7 @@ public class TestBalancerWithNodeGroup {
 
   ClientProtocol client;
 
-  static final long TIMEOUT = 20000L; //msec
+  static final long TIMEOUT = 40000L; //msec
   static final double CAPACITY_ALLOWED_VARIANCE = 0.005;  // 0.5%
   static final double BALANCE_ALLOWED_VARIANCE = 0.11;    // 10%+delta
   static final int DEFAULT_BLOCK_SIZE = 10;