Skip to content

Commit b8216c4

Browse files
committed
HBASE-29191 Use MetaRpcReadTimeout when accessing Meta replicas
1 parent dc22882 commit b8216c4

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Diff for: hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncNonMetaRegionLocator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ private boolean tryComplete(LocateRequest req, CompletableFuture<RegionLocations
234234
int numOfReplicas = CatalogReplicaLoadBalanceSelector.UNINITIALIZED_NUM_OF_REPLICAS;
235235
try {
236236
RegionLocations metaLocations = conn.registry.getMetaRegionLocations()
237-
.get(conn.connConf.getReadRpcTimeoutNs(), TimeUnit.NANOSECONDS);
237+
.get(conn.connConf.getMetaReadRpcTimeoutNs(), TimeUnit.NANOSECONDS);
238238
numOfReplicas = metaLocations.size();
239239
} catch (Exception e) {
240240
LOG.error("Failed to get table {}'s region replication, ", META_TABLE_NAME, e);

Diff for: hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ public void newDead(ServerName sn) {
411411
int numOfReplicas = 1;
412412
try {
413413
RegionLocations metaLocations = this.registry.getMetaRegionLocations()
414-
.get(connectionConfig.getReadRpcTimeout(), TimeUnit.MILLISECONDS);
414+
.get(connectionConfig.getMetaReadRpcTimeout(), TimeUnit.MILLISECONDS);
415415
numOfReplicas = metaLocations.size();
416416
} catch (Exception e) {
417417
LOG.error("Failed to get table {}'s region replication, ", META_TABLE_NAME, e);

Diff for: hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCatalogReplicaLoadBalanceSimpleSelector.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public void testMetaChangeFromReplicaNoReplica() throws IOException, Interrupted
9999
int numOfReplicas = CatalogReplicaLoadBalanceSelector.UNINITIALIZED_NUM_OF_REPLICAS;
100100
try {
101101
RegionLocations metaLocations = CONN.registry.getMetaRegionLocations()
102-
.get(CONN.connConf.getReadRpcTimeoutNs(), TimeUnit.NANOSECONDS);
102+
.get(CONN.connConf.getMetaReadRpcTimeoutNs(), TimeUnit.NANOSECONDS);
103103
numOfReplicas = metaLocations.size();
104104
} catch (Exception e) {
105105
LOG.error("Failed to get table {}'s region replication, ", META_TABLE_NAME, e);
@@ -126,7 +126,7 @@ public void testMetaChangeFromReplicaNoReplica() throws IOException, Interrupted
126126
int numOfReplicas = CatalogReplicaLoadBalanceSelector.UNINITIALIZED_NUM_OF_REPLICAS;
127127
try {
128128
RegionLocations metaLocations = CONN.registry.getMetaRegionLocations()
129-
.get(CONN.connConf.getReadRpcTimeoutNs(), TimeUnit.NANOSECONDS);
129+
.get(CONN.connConf.getMetaReadRpcTimeoutNs(), TimeUnit.NANOSECONDS);
130130
numOfReplicas = metaLocations.size();
131131
} catch (Exception e) {
132132
LOG.error("Failed to get table {}'s region replication, ", META_TABLE_NAME, e);

0 commit comments

Comments
 (0)