Skip to content

Commit 1cb37f1

Browse files
authored
HBASE-22742 [HBCK2] Add more log for hbck operations at master side
Signed-off-by: stack <[email protected]>
1 parent fa77c75 commit 1cb37f1

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
@@ -2383,11 +2383,12 @@ public GetTableStateResponse setTableStateInMeta(RpcController controller,
23832383
SetTableStateInMetaRequest request) throws ServiceException {
23842384
TableName tn = ProtobufUtil.toTableName(request.getTableName());
23852385
try {
2386-
HBaseProtos.TableState prevState =
2387-
this.master.getTableStateManager().getTableState(tn).convert();
2388-
this.master.getTableStateManager().setTableState(tn,
2389-
TableState.convert(tn, request.getTableState()).getState());
2390-
return GetTableStateResponse.newBuilder().setTableState(prevState).build();
2386+
TableState prevState = this.master.getTableStateManager().getTableState(tn);
2387+
TableState newState = TableState.convert(tn, request.getTableState());
2388+
LOG.info("{} set table={} state from {} to {}", master.getClientIdAuditPrefix(),
2389+
tn, prevState.getState(), newState.getState());
2390+
this.master.getTableStateManager().setTableState(tn, newState.getState());
2391+
return GetTableStateResponse.newBuilder().setTableState(prevState.convert()).build();
23912392
} catch (Exception e) {
23922393
throw new ServiceException(e);
23932394
}
@@ -2424,14 +2425,14 @@ private RegionInfo getRegionInfo(HBaseProtos.RegionSpecifier rs) throws UnknownR
24242425
public MasterProtos.AssignsResponse assigns(RpcController controller,
24252426
MasterProtos.AssignsRequest request)
24262427
throws ServiceException {
2427-
LOG.info(master.getClientIdAuditPrefix() + " assigns");
24282428
if (this.master.getMasterProcedureExecutor() == null) {
24292429
throw new ServiceException("Master's ProcedureExecutor not initialized; retry later");
24302430
}
24312431
MasterProtos.AssignsResponse.Builder responseBuilder =
24322432
MasterProtos.AssignsResponse.newBuilder();
24332433
try {
24342434
boolean override = request.getOverride();
2435+
LOG.info("{} assigns, override={}", master.getClientIdAuditPrefix(), override);
24352436
for (HBaseProtos.RegionSpecifier rs: request.getRegionList()) {
24362437
RegionInfo ri = getRegionInfo(rs);
24372438
if (ri == null) {
@@ -2456,14 +2457,14 @@ public MasterProtos.AssignsResponse assigns(RpcController controller,
24562457
public MasterProtos.UnassignsResponse unassigns(RpcController controller,
24572458
MasterProtos.UnassignsRequest request)
24582459
throws ServiceException {
2459-
LOG.info(master.getClientIdAuditPrefix() + " unassigns");
24602460
if (this.master.getMasterProcedureExecutor() == null) {
24612461
throw new ServiceException("Master's ProcedureExecutor not initialized; retry later");
24622462
}
24632463
MasterProtos.UnassignsResponse.Builder responseBuilder =
24642464
MasterProtos.UnassignsResponse.newBuilder();
24652465
try {
24662466
boolean override = request.getOverride();
2467+
LOG.info("{} unassigns, override={}", master.getClientIdAuditPrefix(), override);
24672468
for (HBaseProtos.RegionSpecifier rs: request.getRegionList()) {
24682469
RegionInfo ri = getRegionInfo(rs);
24692470
if (ri == null) {
@@ -2495,6 +2496,9 @@ public MasterProtos.UnassignsResponse unassigns(RpcController controller,
24952496
public MasterProtos.BypassProcedureResponse bypassProcedure(RpcController controller,
24962497
MasterProtos.BypassProcedureRequest request) throws ServiceException {
24972498
try {
2499+
LOG.info("{} bypass procedures={}, waitTime={}, override={}, recursive={}",
2500+
master.getClientIdAuditPrefix(), request.getProcIdList(), request.getWaitTime(),
2501+
request.getOverride(), request.getRecursive());
24982502
List<Boolean> ret =
24992503
master.getMasterProcedureExecutor().bypassProcedure(request.getProcIdList(),
25002504
request.getWaitTime(), request.getOverride(), request.getRecursive());
@@ -2513,6 +2517,8 @@ public MasterProtos.ScheduleServerCrashProcedureResponse scheduleServerCrashProc
25132517
try {
25142518
for (HBaseProtos.ServerName serverName : serverNames) {
25152519
ServerName server = ProtobufUtil.toServerName(serverName);
2520+
LOG.info("{} schedule ServerCrashProcedure for {}",
2521+
master.getClientIdAuditPrefix(), server);
25162522
if (shouldSubmitSCP(server)) {
25172523
master.getServerManager().moveFromOnlineToDeadServers(server);
25182524
ProcedureExecutor<MasterProcedureEnv> procExec = this.master.getMasterProcedureExecutor();

0 commit comments

Comments
 (0)