You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2018/09/21 23:04:32 UTC
hbase git commit: HBASE-21214 [hbck2] setTableState just sets
hbase:meta state, not in-memory state
Repository: hbase
Updated Branches:
refs/heads/branch-2.1 1e05c9f3b -> a22aec1da
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/a22aec1d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a22aec1d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a22aec1d
Branch: refs/heads/branch-2.1
Commit: a22aec1dad08810da222a6eb4bd4fdbc56f43e99
Parents: 1e05c9f
Author: Michael Stack <st...@apache.org>
Authored: Thu Sep 20 12:08:10 2018 -0700
Committer: Michael Stack <st...@apache.org>
Committed: Fri Sep 21 16:03:58 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/a22aec1d/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 2eff6a3..bb49066 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) {