Skip to content

Commit 9b5fd68

Browse files
committed
HBASE-22742 [HBCK2] Add more log for hbck operations at master side
Signed-off-by: stack <[email protected]>
1 parent 474c69a commit 9b5fd68

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2324,11 +2324,12 @@ public GetTableStateResponse setTableStateInMeta(RpcController controller,
23242324
SetTableStateInMetaRequest request) throws ServiceException {
23252325
TableName tn = ProtobufUtil.toTableName(request.getTableName());
23262326
try {
2327-
HBaseProtos.TableState prevState =
2328-
this.master.getTableStateManager().getTableState(tn).convert();
2329-
this.master.getTableStateManager().setTableState(tn,
2330-
TableState.convert(tn, request.getTableState()).getState());
2331-
return GetTableStateResponse.newBuilder().setTableState(prevState).build();
2327+
TableState prevState = this.master.getTableStateManager().getTableState(tn);
2328+
TableState newState = TableState.convert(tn, request.getTableState());
2329+
LOG.info("{} set table={} state from {} to {}", master.getClientIdAuditPrefix(),
2330+
tn, prevState.getState(), newState.getState());
2331+
this.master.getTableStateManager().setTableState(tn, newState.getState());
2332+
return GetTableStateResponse.newBuilder().setTableState(prevState.convert()).build();
23322333
} catch (Exception e) {
23332334
throw new ServiceException(e);
23342335
}
@@ -2365,14 +2366,14 @@ private RegionInfo getRegionInfo(HBaseProtos.RegionSpecifier rs) throws UnknownR
23652366
public MasterProtos.AssignsResponse assigns(RpcController controller,
23662367
MasterProtos.AssignsRequest request)
23672368
throws ServiceException {
2368-
LOG.info(master.getClientIdAuditPrefix() + " assigns");
23692369
if (this.master.getMasterProcedureExecutor() == null) {
23702370
throw new ServiceException("Master's ProcedureExecutor not initialized; retry later");
23712371
}
23722372
MasterProtos.AssignsResponse.Builder responseBuilder =
23732373
MasterProtos.AssignsResponse.newBuilder();
23742374
try {
23752375
boolean override = request.getOverride();
2376+
LOG.info("{} assigns, override={}", master.getClientIdAuditPrefix(), override);
23762377
for (HBaseProtos.RegionSpecifier rs: request.getRegionList()) {
23772378
RegionInfo ri = getRegionInfo(rs);
23782379
if (ri == null) {
@@ -2397,14 +2398,14 @@ public MasterProtos.AssignsResponse assigns(RpcController controller,
23972398
public MasterProtos.UnassignsResponse unassigns(RpcController controller,
23982399
MasterProtos.UnassignsRequest request)
23992400
throws ServiceException {
2400-
LOG.info(master.getClientIdAuditPrefix() + " unassigns");
24012401
if (this.master.getMasterProcedureExecutor() == null) {
24022402
throw new ServiceException("Master's ProcedureExecutor not initialized; retry later");
24032403
}
24042404
MasterProtos.UnassignsResponse.Builder responseBuilder =
24052405
MasterProtos.UnassignsResponse.newBuilder();
24062406
try {
24072407
boolean override = request.getOverride();
2408+
LOG.info("{} unassigns, override={}", master.getClientIdAuditPrefix(), override);
24082409
for (HBaseProtos.RegionSpecifier rs: request.getRegionList()) {
24092410
RegionInfo ri = getRegionInfo(rs);
24102411
if (ri == null) {
@@ -2436,6 +2437,9 @@ public MasterProtos.UnassignsResponse unassigns(RpcController controller,
24362437
public MasterProtos.BypassProcedureResponse bypassProcedure(RpcController controller,
24372438
MasterProtos.BypassProcedureRequest request) throws ServiceException {
24382439
try {
2440+
LOG.info("{} bypass procedures={}, waitTime={}, override={}, recursive={}",
2441+
master.getClientIdAuditPrefix(), request.getProcIdList(), request.getWaitTime(),
2442+
request.getOverride(), request.getRecursive());
24392443
List<Boolean> ret =
24402444
master.getMasterProcedureExecutor().bypassProcedure(request.getProcIdList(),
24412445
request.getWaitTime(), request.getOverride(), request.getRecursive());
@@ -2454,6 +2458,8 @@ public MasterProtos.ScheduleServerCrashProcedureResponse scheduleServerCrashProc
24542458
try {
24552459
for (HBaseProtos.ServerName serverName : serverNames) {
24562460
ServerName server = ProtobufUtil.toServerName(serverName);
2461+
LOG.info("{} schedule ServerCrashProcedure for {}",
2462+
master.getClientIdAuditPrefix(), server);
24572463
if (shouldSubmitSCP(server)) {
24582464
master.getServerManager().moveFromOnlineToDeadServers(server);
24592465
ProcedureExecutor<MasterProcedureEnv> procExec = this.master.getMasterProcedureExecutor();

0 commit comments

Comments
 (0)