HBASE-27250 MasterRpcService#setRegionStateInMeta does not support replica region encodedNames or region names

Author: Huaxiang Sun

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

@@ -32,6 +32,7 @@
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.stream.Collectors;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.CatalogFamilyFormat;
 import org.apache.hadoop.hbase.ClusterMetricsBuilder;
 import org.apache.hadoop.hbase.DoNotRetryIOException;
 import org.apache.hadoop.hbase.HBaseRpcServicesBase;
@@ -49,6 +50,7 @@
 import org.apache.hadoop.hbase.client.NormalizeTableFilterParams;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.client.RegionInfo;
+import org.apache.hadoop.hbase.client.RegionInfoBuilder;
 import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.client.TableDescriptor;
 import org.apache.hadoop.hbase.client.TableState;
@@ -2479,30 +2481,41 @@ public SetRegionStateInMetaResponse setRegionStateInMeta(RpcController controlle
       for (RegionSpecifierAndState s : request.getStatesList()) {
         RegionSpecifier spec = s.getRegionSpecifier();
         String encodedName;
+        RegionInfo info;
+        int replicaId;
         if (spec.getType() == RegionSpecifierType.ENCODED_REGION_NAME) {
-          encodedName = spec.getValue().toStringUtf8();
+          info = this.server.getAssignmentManager().getRegionInfoFromEncodedRegionName(
+            spec.getValue().toStringUtf8());
         } else {
           // TODO: actually, a full region name can save a lot on meta scan, improve later.
-          encodedName = RegionInfo.encodeRegionName(spec.getValue().toByteArray());
+          info = CatalogFamilyFormat.parseRegionInfoFromRegionName(spec.getValue().toByteArray());
         }
-        RegionInfo info = this.server.getAssignmentManager().loadRegionFromMeta(encodedName);
-        LOG.trace("region info loaded from meta table: {}", info);
+        replicaId = info.getReplicaId();
+        LOG.trace("region info", info);
         RegionState prevState =
           this.server.getAssignmentManager().getRegionStates().getRegionState(info);
         RegionState.State newState = RegionState.State.convert(s.getState());
         LOG.info("{} set region={} state from {} to {}", server.getClientIdAuditPrefix(), info,
           prevState.getState(), newState);
-        Put metaPut =
-          MetaTableAccessor.makePutFromRegionInfo(info, EnvironmentEdgeManager.currentTime());
-        metaPut.addColumn(HConstants.CATALOG_FAMILY, HConstants.STATE_QUALIFIER,
-          Bytes.toBytes(newState.name()));
-        List<Put> putList = new ArrayList<>();
-        putList.add(metaPut);
-        MetaTableAccessor.putsToMetaTable(this.server.getConnection(), putList);
-        // Loads from meta again to refresh AM cache with the new region state
-        this.server.getAssignmentManager().loadRegionFromMeta(encodedName);
-        builder.addStates(RegionSpecifierAndState.newBuilder().setRegionSpecifier(spec)
-          .setState(prevState.getState().convert()));
+        // If state does not change, no need to set.
+        if (prevState.getState() != newState) {
+          if (replicaId > RegionInfo.DEFAULT_REPLICA_ID) {
+            // If it is a non-primary replica region, use primary region as the key.
+            info = RegionInfoBuilder.newBuilder(info).setReplicaId(RegionInfo.DEFAULT_REPLICA_ID).
+              build();
+          }
+          Put metaPut = new Put(info.getRegionName());
+          metaPut.addColumn(HConstants.CATALOG_FAMILY,
+            CatalogFamilyFormat.getRegionStateColumn(replicaId),
+            Bytes.toBytes(newState.name()));
+          List<Put> putList = new ArrayList<>();
+          putList.add(metaPut);
+          MetaTableAccessor.putsToMetaTable(this.server.getConnection(), putList);
+          // Loads from meta again to refresh AM cache with the new region state
+          this.server.getAssignmentManager().loadRegionFromMeta(info.getEncodedName());
+          builder.addStates(RegionSpecifierAndState.newBuilder().setRegionSpecifier(spec).
+            setState(prevState.getState().convert()));
+        }
       }
     } catch (Exception e) {
       throw new ServiceException(e);

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

@@ -1884,6 +1884,12 @@ public RegionInfo getRegionInfo(final byte[] regionName) {
     return regionState != null ? regionState.getRegionInfo() : null;
   }
 
+  public RegionInfo getRegionInfoFromEncodedRegionName(final String encodedRegionName) {
+    final RegionStateNode regionState =
+      regionStates.getRegionStateNodeFromEncodedRegionName(encodedRegionName);
+    return regionState != null ? regionState.getRegionInfo() : null;
+  }
+
   // ============================================================================================
   // Expected states on region state transition.
   // Notice that there is expected states for transiting to OPENING state, this is because SCP.

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

@@ -144,6 +144,10 @@ public RegionStateNode getRegionStateNodeFromName(byte[] regionName) {
     return regionsMap.get(regionName);
   }
 
+  public RegionStateNode getRegionStateNodeFromEncodedRegionName(final String encodedRegionName) {
+    return encodedRegionsMap.get(encodedRegionName);
+  }
+
   public RegionStateNode getRegionStateNode(RegionInfo regionInfo) {
     return getRegionStateNodeFromName(regionInfo.getRegionName());
   }

hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHbck.java

@@ -117,7 +117,8 @@ private Hbck getHbck() throws Exception {
   @BeforeClass
   public static void setUpBeforeClass() throws Exception {
     TEST_UTIL.startMiniCluster(3);
-    TEST_UTIL.createMultiRegionTable(TABLE_NAME, Bytes.toBytes("family1"), 5);
+    TEST_UTIL.createMultiRegionTable(TABLE_NAME, 3,
+      new byte[][] {Bytes.toBytes("family1")});
     procExec = TEST_UTIL.getMiniHBaseCluster().getMaster().getMasterProcedureExecutor();
     ASYNC_CONN = ConnectionFactory.createAsyncConnection(TEST_UTIL.getConfiguration()).get();
     TEST_UTIL.getHBaseCluster().getMaster().getMasterCoprocessorHost().load(