diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java index 331f2d1..8412511 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java @@ -1265,6 +1265,21 @@ public interface Admin extends Abortable, Closeable { boolean isCleanerChoreEnabled() throws IOException; /** + * Merge two regions. Synchronous operation. + * Note: It is not feasible to predict the length of merge. + * Therefore, this is for internal testing only. + * @param nameOfRegionA encoded or full name of region a + * @param nameOfRegionB encoded or full name of region b + * @param forcible true if do a compulsory merge, otherwise we will only merge + * two adjacent regions + * @throws IOException + */ + public void mergeRegionsSync( + final byte[] nameOfRegionA, + final byte[] nameOfRegionB, + final boolean forcible) throws IOException; + + /** * Merge two regions. Asynchronous operation. * * @param nameOfRegionA encoded or full name of region a diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java index 172db5b..bb2d338 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java @@ -1627,6 +1627,7 @@ public class HBaseAdmin implements Admin { * @throws IOException */ @VisibleForTesting + @Override public void mergeRegionsSync( final byte[] nameOfRegionA, final byte[] nameOfRegionB,