You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zg...@apache.org on 2019/07/27 05:14:43 UTC

[hbase] branch branch-2.0 updated: HBASE-22742 [HBCK2] Add more log for hbck operations at master side

This is an automated email from the ASF dual-hosted git repository.

zghao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2.0 by this push:
     new 7b3f9e8  HBASE-22742 [HBCK2] Add more log for hbck operations at master side
7b3f9e8 is described below

commit 7b3f9e814dff9b6f3eeffce42388e034675487d0
Author: Guanghao Zhang <zg...@apache.org>
AuthorDate: Sat Jul 27 12:25:11 2019 +0800

    HBASE-22742 [HBCK2] Add more log for hbck operations at master side
    
    Signed-off-by: stack <st...@apache.org>
---
 .../apache/hadoop/hbase/master/MasterRpcServices.java | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 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 72bc968..0fc3545 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
@@ -2264,10 +2264,12 @@ public class MasterRpcServices extends RSRpcServices
     TableName tn = ProtobufUtil.toTableName(request.getTableName());
 
     try {
-      HBaseProtos.TableState prevState = MetaTableAccessor.getTableState(conn, tn).convert();
-      MetaTableAccessor.updateTableState(conn, tn,
-          TableState.convert(tn, request.getTableState()).getState());
-      return GetTableStateResponse.newBuilder().setTableState(prevState).build();
+      TableState prevState = MetaTableAccessor.getTableState(conn, 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);
     }
@@ -2321,7 +2323,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");
     }
@@ -2329,6 +2330,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));
@@ -2348,7 +2350,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");
     }
@@ -2356,6 +2357,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));
@@ -2382,6 +2384,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());
@@ -2400,6 +2405,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)) {
           ProcedureExecutor<MasterProcedureEnv> procExec = this.master.getMasterProcedureExecutor();
           pids.add(procExec.submitProcedure(new ServerCrashProcedure(procExec.getEnvironment(),