[hbase] 02/03: HBASE-22771 [HBCK2] fixMeta method and server-side support

[st...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

stack pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit 5fa86682026b1ce2f84cffe51ef81e49556fa4c8
Author: stack <st...@apache.org>
AuthorDate: Tue Jul 30 17:07:48 2019 -0700

    HBASE-22771 [HBCK2] fixMeta method and server-side support
    
    This is a first cut at this patch. Implements hold fixing only
    currently.
    
    Add a fixMeta method to Hbck Interface.
    
    M hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
     Bug fix. If hole is on end of last table, I wasn't seeing it.
    
    A hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetaFixer.java
     Add a general meta fixer class. Explains up top why this stuff doesn't
     belong inside MetaTableAccessor.
    
    M hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
     Break out the filesystem messing so don't have to copy it nor do more
     than is needed doing fixup for Region holes.
    
    M hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java
     Change behavious slightly. If directory exists, don't fail as we did
     but try and keep going and create .regioninfo file if missing (or
     overwrite if in place). This should make it idempotent. Can rerun
     command. Lets see if any repercussions in test suite.
    
    A hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMetaFixer.java
     Add test.
    
    Signed-off-by: Zheng Hu <op...@gmail.com>
    Signed-off-by: Guanghao Zhang <zg...@apache.org>
---
 .../src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java | 2 +-
 .../src/test/java/org/apache/hadoop/hbase/master/TestMetaFixer.java     | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
index 84402c3..9be2045 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
@@ -182,8 +182,8 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTabl
 import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.EnableTableResponse;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureRequest;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ExecProcedureResponse;
-import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.FixMetaResponse;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.FixMetaRequest;
+import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.FixMetaResponse;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetClusterStatusRequest;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetClusterStatusResponse;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.GetCompletedSnapshotsRequest;
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMetaFixer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMetaFixer.java
index 6a24f86..2bffe31 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMetaFixer.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMetaFixer.java
@@ -25,9 +25,7 @@ import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.MetaTableAccessor;
 import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.client.Delete;
 import org.apache.hadoop.hbase.client.RegionInfo;
-import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.testclassification.LargeTests;
 import org.apache.hadoop.hbase.testclassification.MasterTests;
 import org.junit.AfterClass;