Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-22742 [HBCK2] Add more log for hbck operations at master side 

Signed-off-by: stack <stack@apache.org>
This commit is contained in:
Guanghao Zhang 2019-07-27 12:25:11 +08:00
parent a1442a8295
commit f8b592e9f8
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2303,11 +2303,12 @@ public class MasterRpcServices extends RSRpcServices
SetTableStateInMetaRequest request) throws ServiceException {
TableName tn = ProtobufUtil.toTableName(request.getTableName());
try {
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();
TableState prevState = this.master.getTableStateManager().getTableState(tn);
TableState newState = TableState.convert(tn, request.getTableState());
LOG.info("{} set table={} state from {} to {}", master.getClientIdAuditPrefix(),
tn, prevState.getState(), newState.getState());
this.master.getTableStateManager().setTableState(tn, newState.getState());
return GetTableStateResponse.newBuilder().setTableState(prevState.convert()).build();
} catch (Exception e) {
throw new ServiceException(e);
}
@ -2361,7 +2362,6 @@ public class MasterRpcServices extends RSRpcServices
public MasterProtos.AssignsResponse assigns(RpcController controller,
MasterProtos.AssignsRequest request)
throws ServiceException {
LOG.info(master.getClientIdAuditPrefix() + " assigns");
if (this.master.getMasterProcedureExecutor() == null) {
throw new ServiceException("Master's ProcedureExecutor not initialized; retry later");
}
@ -2369,6 +2369,7 @@ public class MasterRpcServices extends RSRpcServices
MasterProtos.AssignsResponse.newBuilder();
try {
boolean override = request.getOverride();
LOG.info("{} assigns, override={}", master.getClientIdAuditPrefix(), override);
for (HBaseProtos.RegionSpecifier rs: request.getRegionList()) {
long pid = submitProcedure(rs, override,
(r, b) -> this.master.getAssignmentManager().createAssignProcedure(r, b));
@ -2388,7 +2389,6 @@ public class MasterRpcServices extends RSRpcServices
public MasterProtos.UnassignsResponse unassigns(RpcController controller,
MasterProtos.UnassignsRequest request)
throws ServiceException {
LOG.info(master.getClientIdAuditPrefix() + " unassigns");
if (this.master.getMasterProcedureExecutor() == null) {
throw new ServiceException("Master's ProcedureExecutor not initialized; retry later");
}
@ -2396,6 +2396,7 @@ public class MasterRpcServices extends RSRpcServices
MasterProtos.UnassignsResponse.newBuilder();
try {
boolean override = request.getOverride();
LOG.info("{} unassigns, override={}", master.getClientIdAuditPrefix(), override);
for (HBaseProtos.RegionSpecifier rs: request.getRegionList()) {
long pid = submitProcedure(rs, override,
(r, b) -> this.master.getAssignmentManager().createUnassignProcedure(r, b));
@ -2422,6 +2423,9 @@ public class MasterRpcServices extends RSRpcServices
public MasterProtos.BypassProcedureResponse bypassProcedure(RpcController controller,
MasterProtos.BypassProcedureRequest request) throws ServiceException {
try {
LOG.info("{} bypass procedures={}, waitTime={}, override={}, recursive={}",
master.getClientIdAuditPrefix(), request.getProcIdList(), request.getWaitTime(),
request.getOverride(), request.getRecursive());
List<Boolean> ret =
master.getMasterProcedureExecutor().bypassProcedure(request.getProcIdList(),
request.getWaitTime(), request.getOverride(), request.getRecursive());
@ -2440,6 +2444,8 @@ public class MasterRpcServices extends RSRpcServices
try {
for (HBaseProtos.ServerName serverName : serverNames) {
ServerName server = ProtobufUtil.toServerName(serverName);
LOG.info("{} schedule ServerCrashProcedure for {}",
master.getClientIdAuditPrefix(), server);
if (shouldSubmitSCP(server)) {
master.getServerManager().moveFromOnlineToDeadServers(server);
ProcedureExecutor<MasterProcedureEnv> procExec = this.master.getMasterProcedureExecutor();