svn merge -c 1584900 Merging from trunk to branch-2 to fix:HDFS-6159. TestBalancerWithNodeGroup.testBalancerWithNodeGroup fails if there is block missing after balancer success.

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

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

@@ -59,6 +59,9 @@ Release 2.5.0 - UNRELEASED
 
     HDFS-6190. Minor textual fixes in DFSClient. (Charles Lamb via wheat9)
 
+    HDFS-6159. TestBalancerWithNodeGroup.testBalancerWithNodeGroup fails if 
+    there is block missing after balancer success (Chen He via kihwal)
+
 Release 2.4.1 - UNRELEASED
 
   INCOMPATIBLE CHANGES

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

@@ -53,7 +53,7 @@ public class TestBalancerWithNodeGroup {
   private static final Log LOG = LogFactory.getLog(
   "org.apache.hadoop.hdfs.TestBalancerWithNodeGroup");
   
-  final private static long CAPACITY = 500L;
+  final private static long CAPACITY = 6000L;
   final private static String RACK0 = "/rack0";
   final private static String RACK1 = "/rack1";
   final private static String NODEGROUP0 = "/nodegroup0";
@@ -68,7 +68,7 @@ public class TestBalancerWithNodeGroup {
   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;
+  static final int DEFAULT_BLOCK_SIZE = 100;
 
   static {
     Balancer.setBlockMoveWaitTime(1000L) ;