HBASE-22771 [HBCK2] fixMeta method and server-side support; AMENDMENT remove mistaken .rej commit

This commit is contained in:
stack 2019-08-05 22:39:54 -07:00
parent 5fa8668202
commit c03bf73e24

View File

@ -1,17 +0,0 @@
diff a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseHbck.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseHbck.java (rejected hunks)
@@ -186,4 +187,13 @@ public class HBaseHbck implements Hbck {
throw new IOException(se);
}
}
-}
\ No newline at end of file
+
+ @Override
+ public void fixMeta() throws IOException {
+ try {
+ this.hbck.fixMeta(rpcControllerFactory.newController(), FixMetaRequest.newBuilder().build());
+ } catch (ServiceException se) {
+ throw new IOException(se);
+ }
+ }
+}