hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerry...@apache.org
Subject hbase git commit: HBASE-18557: Change splitable to mergeable in MergeTableRegionsProcedure
Date Fri, 11 Aug 2017 20:37:00 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-2 b627cfad3 -> b5a4e07c6


HBASE-18557: Change splitable to mergeable in MergeTableRegionsProcedure

Signed-off-by: Jerry He <jerryjch@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b5a4e07c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b5a4e07c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b5a4e07c

Branch: refs/heads/branch-2
Commit: b5a4e07c6a521b13146daccb7a9d502317fde427
Parents: b627cfa
Author: Yi Liang <yliang@us.ibm.com>
Authored: Thu Aug 10 11:15:59 2017 -0700
Committer: Jerry He <jerryjch@apache.org>
Committed: Fri Aug 11 13:29:13 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/b5a4e07c/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();
   }
 
   /**


Mime
View raw message