HBASE-18557: Change splitable to mergeable in MergeTableRegionsProcedure Signed-off-by: Jerry He <jerry...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/95e88396 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/95e88396 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/95e88396 Branch: refs/heads/HBASE-14070.HLC Commit: 95e883967cbb383b48d8fae548fb55b88c7f0529 Parents: aa8f67a Author: Yi Liang <yli...@us.ibm.com> Authored: Thu Aug 10 11:15:59 2017 -0700 Committer: Jerry He <jerry...@apache.org> Committed: Fri Aug 11 22:45:22 2017 -0700 ---------------------------------------------------------------------- .../hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/95e88396/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java index 74d9b75..9aaf297 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MergeTableRegionsProcedure.java @@ -513,7 +513,7 @@ public class MergeTableRegionsProcedure throws IOException { GetRegionInfoResponse response = Util.getRegionInfoResponse(env, rs.getServerName(), rs.getRegion()); - return response.hasSplittable() && response.getSplittable(); + return response.hasMergeable() && response.getMergeable(); } /**
