svn commit: r1588115 - /hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRegionChecker.java

[li...@apache.org]

Author: liyin
Date: Thu Apr 17 00:49:06 2014
New Revision: 1588115

URL: http://svn.apache.org/r1588115
Log:
[Master] Fix TestRegionChecker

Author: liyintang

Summary: There was a bug in the TestRegionChecker. In the unit tests, the test function tries to verify whether avDetDayAfter contains all the re-assigned regions. However, the ROOT region will not be included in such collection based on the design of the HRegionChecker. Therefore, the fix is to exclude the ROOT region from the checking.

Test Plan: will run this unit tests multiple times to verify

Reviewers: rshroff

Reviewed By: rshroff

CC: hbase-dev@

Differential Revision: https://phabricator.fb.com/D1276146

Task ID: 3297398

Modified:
    hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRegionChecker.java

Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRegionChecker.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRegionChecker.java?rev=1588115&r1=1588114&r2=1588115&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRegionChecker.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/master/TestRegionChecker.java Thu Apr 17 00:49:06 2014
@@ -1,26 +1,9 @@
 package org.apache.hadoop.hbase.master;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HColumnDescriptor;
-import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.HRegionInfo;
-import org.apache.hadoop.hbase.HServerAddress;
-import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.MiniHBaseCluster;
+import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.client.HTable;
 import org.apache.hadoop.hbase.master.RegionChecker.RegionAvailabilityInfo;
@@ -30,6 +13,14 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static org.junit.Assert.*;
+
 public class TestRegionChecker {
   final static Log LOG = LogFactory.getLog(TestRegionChecker.class);
   private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
@@ -157,7 +148,8 @@ public class TestRegionChecker {
 
     List<String> regionsToKill = new ArrayList<String>();
     for (HRegionInfo info : cluster.getRegionServer(serverId).getRegionsAssignment()) {
-      regionsToKill.add(info.getRegionNameAsString());
+      if (!info.isMetaRegion() && !info.isRootRegion())
+        regionsToKill.add(info.getRegionNameAsString());
     }
 
     int regionCnt = cluster.getRegionServer(serverId).getOnlineRegions().size();