Repository: hbase Updated Branches: refs/heads/branch-2 6dc9f9e6d -> 29214c77a
HBASE-21214 [hbck2] setTableState just sets hbase:meta state, not in-memory state Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/29214c77 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/29214c77 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/29214c77 Branch: refs/heads/branch-2 Commit: 29214c77a6173fc0f879879f5ac8d243d1c14623 Parents: 6dc9f9e Author: Michael Stack <[email protected]> Authored: Thu Sep 20 12:08:10 2018 -0700 Committer: Michael Stack <[email protected]> Committed: Fri Sep 21 16:04:42 2018 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/master/MasterRpcServices.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/29214c77/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java ---------------------------------------------------------------------- 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 c8fbecd..62c80a6 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 @@ -2295,12 +2295,11 @@ public class MasterRpcServices extends RSRpcServices @Override public GetTableStateResponse setTableStateInMeta(RpcController controller, SetTableStateInMetaRequest request) throws ServiceException { - Connection conn = master.getConnection(); TableName tn = ProtobufUtil.toTableName(request.getTableName()); - try { - HBaseProtos.TableState prevState = MetaTableAccessor.getTableState(conn, tn).convert(); - MetaTableAccessor.updateTableState(conn, tn, + HBaseProtos.TableState prevState = + this.master.getTableStateManager().getTableState(tn).convert(); + this.master.getTableStateManager().setTableState(tn, TableState.convert(tn, request.getTableState()).getState()); return GetTableStateResponse.newBuilder().setTableState(prevState).build(); } catch (Exception e) {
