Revert "HBASE-26649 Support meta replica LoadBalance mode for RegionL…

…ocator#getAllRegionLocations() (#4044)" This reverts commit 8c60739.
apache · Jan 31, 2022 · 351caa5 · 351caa5
1 parent d132bd0
commit 351caa5
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 58 deletions.
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClientMetaTableAccessor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ClientMetaTableAccessor.java
@@ -17,7 +17,6 @@
  */
 package org.apache.hadoop.hbase;
 
-import static org.apache.hadoop.hbase.client.RegionLocator.LOCATOR_META_REPLICAS_MODE;
 import static org.apache.hadoop.hbase.util.FutureUtils.addListener;
 
 import java.io.Closeable;
@@ -27,7 +26,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ThreadLocalRandom;
 import java.util.stream.Collectors;
 import org.apache.hadoop.hbase.client.AdvancedScanResultConsumer;
 import org.apache.hadoop.hbase.client.AsyncTable;
@@ -418,40 +416,10 @@ private static Scan getMetaScan(AsyncTable<?> metaTable, int rowUpperLimit) {
     Scan scan = new Scan();
     int scannerCaching = metaTable.getConfiguration().getInt(HConstants.HBASE_META_SCANNER_CACHING,
       HConstants.DEFAULT_HBASE_META_SCANNER_CACHING);
-    // Get the region locator's meta replica mode.
-    CatalogReplicaMode metaReplicaMode = CatalogReplicaMode.fromString(metaTable.getConfiguration()
-      .get(LOCATOR_META_REPLICAS_MODE, CatalogReplicaMode.NONE.toString()));
-
-    switch (metaReplicaMode) {
-      case LOAD_BALANCE:
-        int numOfReplicas = 1;
-        try {
-          numOfReplicas = metaTable.getDescriptor().get().getRegionReplication();
-        } catch (Exception e) {
-          LOG.warn("Failed to get region replication for meta table");
-        }
-        if (numOfReplicas > 1) {
-          int replicaId = ThreadLocalRandom.current().nextInt(numOfReplicas);
-
-          // When the replicaId is 0, do not set to Consistency.TIMELINE
-          if (replicaId > 0) {
-            scan.setReplicaId(replicaId);
-            scan.setConsistency(Consistency.TIMELINE);
-          }
-        }
-        break;
-      case NONE:
-        // If user does not configure LOCATOR_META_REPLICAS_MODE, let's check the legacy config.
-        if (metaTable.getConfiguration().getBoolean(HConstants.USE_META_REPLICAS,
-          HConstants.DEFAULT_USE_META_REPLICAS)) {
-          scan.setConsistency(Consistency.TIMELINE);
-        }
-        break;
-
-      default:
-        // Do nothing
+    if (metaTable.getConfiguration().getBoolean(HConstants.USE_META_REPLICAS,
+      HConstants.DEFAULT_USE_META_REPLICAS)) {
+      scan.setConsistency(Consistency.TIMELINE);
     }
-
     if (rowUpperLimit <= scannerCaching) {
       scan.setLimit(rowUpperLimit);
     }

diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.java
@@ -50,7 +50,6 @@
 import java.util.concurrent.TimeUnit;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.hadoop.hbase.CatalogFamilyFormat;
-import org.apache.hadoop.hbase.CatalogReplicaMode;
 import org.apache.hadoop.hbase.HBaseIOException;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.HRegionLocation;

diff --git a/...ache/hadoop/hbase/CatalogReplicaMode.java → ...doop/hbase/client/CatalogReplicaMode.java b/...ache/hadoop/hbase/CatalogReplicaMode.java → ...doop/hbase/client/CatalogReplicaMode.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.hadoop.hbase;
+package org.apache.hadoop.hbase.client;
 
 import org.apache.yetus.audience.InterfaceAudience;
 
@@ -33,7 +33,7 @@
  * </ol>
  */
 @InterfaceAudience.Private
-public enum CatalogReplicaMode {
+enum CatalogReplicaMode {
   NONE {
     @Override
     public String toString() {

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncNonMetaRegionLocator.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncNonMetaRegionLocator.java
@@ -36,7 +36,6 @@
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.stream.IntStream;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.CatalogReplicaMode;
 import org.apache.hadoop.hbase.HBaseClassTestRule;
 import org.apache.hadoop.hbase.HBaseTestingUtil;
 import org.apache.hadoop.hbase.HRegionLocation;

diff --git a/...va/org/apache/hadoop/hbase/replication/regionserver/TestMetaRegionReplicaReplication.java b/...va/org/apache/hadoop/hbase/replication/regionserver/TestMetaRegionReplicaReplication.java
@@ -43,7 +43,6 @@
 import org.apache.hadoop.hbase.client.ConnectionFactory;
 import org.apache.hadoop.hbase.client.Get;
 import org.apache.hadoop.hbase.client.RegionInfo;
-import org.apache.hadoop.hbase.client.RegionLocator;
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.client.Table;
@@ -386,12 +385,6 @@ private void primaryNoChangeReplicaIncrease(final long[] before, final long[] af
     }
   }
 
-  private void PrimaryIncreaseReplicaIncrease(final long[] before, final long[] after) {
-    for (int i = 0; i < after.length; i++) {
-      assertTrue(after[i] > before[i]);
-    }
-  }
-
   private void primaryIncreaseReplicaNoChange(final long[] before, final long[] after) {
     // There are read requests increase for primary meta replica.
     assertTrue(after[RegionInfo.DEFAULT_REPLICA_ID] > before[RegionInfo.DEFAULT_REPLICA_ID]);
@@ -417,7 +410,6 @@ public void testHBaseMetaReplicaGets() throws Exception {
     final Region[] metaRegions = getAllRegions(TableName.META_TABLE_NAME, numOfMetaReplica);
     long[] readReqsForMetaReplicas = new long[numOfMetaReplica];
     long[] readReqsForMetaReplicasAfterGet = new long[numOfMetaReplica];
-    long[] readReqsForMetaReplicasAfterGetAllLocations = new long[numOfMetaReplica];
     long[] readReqsForMetaReplicasAfterMove = new long[numOfMetaReplica];
     long[] readReqsForMetaReplicasAfterSecondMove = new long[numOfMetaReplica];
     long[] readReqsForMetaReplicasAfterThirdGet = new long[numOfMetaReplica];
@@ -467,16 +459,6 @@ public void testHBaseMetaReplicaGets() throws Exception {
       // For rest of meta replicas, there are more reads against them.
       primaryNoChangeReplicaIncrease(readReqsForMetaReplicas, readReqsForMetaReplicasAfterGet);
 
-      RegionLocator locator = tableForGet.getRegionLocator();
-
-      for (int j = 0; j < numOfMetaReplica * 3; j ++) {
-        locator.getAllRegionLocations();
-      }
-
-      getMetaReplicaReadRequests(metaRegions, readReqsForMetaReplicasAfterGetAllLocations);
-      PrimaryIncreaseReplicaIncrease(readReqsForMetaReplicasAfterGet,
-        readReqsForMetaReplicasAfterGetAllLocations);
-
       // move one of regions so it meta cache may be invalid.
       HTU.moveRegionAndWait(userRegion.getRegionInfo(), destRs.getServerName());
 
@@ -486,7 +468,7 @@ public void testHBaseMetaReplicaGets() throws Exception {
 
       // There are read requests increase for primary meta replica.
       // For rest of meta replicas, there is no change as regionMove will tell the new location
-      primaryIncreaseReplicaNoChange(readReqsForMetaReplicasAfterGetAllLocations,
+      primaryIncreaseReplicaNoChange(readReqsForMetaReplicasAfterGet,
         readReqsForMetaReplicasAfterMove);
       // Move region again.
       HTU.moveRegionAndWait(userRegion.getRegionInfo(), srcRs.getServerName());