From aa73186a2c5eece40ac96ce3460f9d2ffeb1a4e8 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Thu, 20 Sep 2018 12:08:10 -0700 Subject: [PATCH] HBASE-21214 [hbck2] setTableState just sets hbase:meta state, not in-memory state --- .../java/org/apache/hadoop/hbase/master/MasterRpcServices.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 6467ea2d57..e0ee68e405 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 @@ -2329,12 +2329,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) { -- 2.16.3