You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2019/12/16 18:26:32 UTC
[hbase] branch branch-2.2 updated: HBASE-23575 Remove dead code in
AsyncRegistry (#940)
This is an automated email from the ASF dual-hosted git repository.
busbey pushed a commit to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.2 by this push:
new 60889cd HBASE-23575 Remove dead code in AsyncRegistry (#940)
60889cd is described below
commit 60889cd95d4df0873e5b638d978b9eaf1480465d
Author: Bharath Vissapragada <bh...@apache.org>
AuthorDate: Wed Dec 11 17:44:56 2019 -0800
HBASE-23575 Remove dead code in AsyncRegistry (#940)
Removes a bunch of dead code and fixes some checkstyle nits.
(cherry picked from commit efa4fe901a3c050b0db087c45d47d250c7ca1039)
(cherry picked from commit a3fcc8badb92e79546f4fe072df5a72773a89c5e)
Signed-off-by: Jan Hentschel <ja...@apache.org>
Signed-off-by: Xu Cang <xu...@apache.org>
Signed-off-by: Sean Busbey <bu...@apache.org>
Signed-off-by: Viraj Jasani <vi...@gmail.com>
---
.../org/apache/hadoop/hbase/client/AsyncRegistry.java | 15 +--------------
.../apache/hadoop/hbase/client/ClusterConnection.java | 6 ------
.../hadoop/hbase/client/ConnectionImplementation.java | 5 -----
.../apache/hadoop/hbase/client/ZKAsyncRegistry.java | 18 ++----------------
.../hadoop/hbase/client/DoNothingAsyncRegistry.java | 13 +------------
.../apache/hadoop/hbase/client/TestAsyncProcess.java | 5 -----
.../hadoop/hbase/client/TestClientNoCluster.java | 5 -----
.../java/org/apache/hadoop/hbase/MiniHBaseCluster.java | 7 +++++++
.../org/apache/hadoop/hbase/client/TestAdmin1.java | 12 ++++++------
.../hadoop/hbase/client/TestAsyncTableAdminApi.java | 9 +++------
.../hadoop/hbase/client/TestZKAsyncRegistry.java | 6 +-----
11 files changed, 21 insertions(+), 80 deletions(-)
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRegistry.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRegistry.java
index 96329dc..9537777 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRegistry.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRegistry.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -19,15 +19,12 @@ package org.apache.hadoop.hbase.client;
import java.io.Closeable;
import java.util.concurrent.CompletableFuture;
-
import org.apache.hadoop.hbase.RegionLocations;
import org.apache.hadoop.hbase.ServerName;
import org.apache.yetus.audience.InterfaceAudience;
/**
* Implementations hold cluster information such as this cluster's id, location of hbase:meta, etc..
- * All stuffs that may be related to zookeeper at client side are placed here.
- * <p>
* Internal use only.
*/
@InterfaceAudience.Private
@@ -46,21 +43,11 @@ interface AsyncRegistry extends Closeable {
CompletableFuture<String> getClusterId();
/**
- * Get the number of 'running' regionservers.
- */
- CompletableFuture<Integer> getCurrentNrHRS();
-
- /**
* Get the address of HMaster.
*/
CompletableFuture<ServerName> getMasterAddress();
/**
- * Get the info port of HMaster.
- */
- CompletableFuture<Integer> getMasterInfoPort();
-
- /**
* Closes this instance and releases any system resources associated with it
*/
@Override
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterConnection.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterConnection.java
index 9b2222b..9968404 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterConnection.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClusterConnection.java
@@ -323,10 +323,4 @@ public interface ClusterConnection extends Connection {
* supports cell blocks.
*/
boolean hasCellBlockSupport();
-
- /**
- * @return the number of region servers that are currently running
- * @throws IOException if a remote or network exception occurs
- */
- int getCurrentNrHRS() throws IOException;
}
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
index eaea9c2..7ddbfaa 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
@@ -1991,11 +1991,6 @@ class ConnectionImplementation implements ClusterConnection, Closeable {
}
@Override
- public int getCurrentNrHRS() throws IOException {
- return get(this.registry.getCurrentNrHRS());
- }
-
- @Override
public void close() {
if (this.closed) {
return;
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKAsyncRegistry.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKAsyncRegistry.java
index 36fa6bb..08e3846 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKAsyncRegistry.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKAsyncRegistry.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -24,7 +24,6 @@ import static org.apache.hadoop.hbase.client.RegionReplicaUtil.getRegionInfoForR
import static org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil.lengthOfPBMagic;
import static org.apache.hadoop.hbase.util.FutureUtils.addListener;
import static org.apache.hadoop.hbase.zookeeper.ZKMetadata.removeMetaData;
-
import java.io.IOException;
import java.util.List;
import java.util.concurrent.CompletableFuture;
@@ -43,14 +42,12 @@ import org.apache.hadoop.hbase.zookeeper.ZNodePaths;
import org.apache.yetus.audience.InterfaceAudience;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;
-
import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos;
import org.apache.hadoop.hbase.shaded.protobuf.generated.ZooKeeperProtos;
/**
- * Fetch the registry data from zookeeper.
+ * Zookeeper based registry implementation.
*/
@InterfaceAudience.Private
class ZKAsyncRegistry implements AsyncRegistry {
@@ -210,11 +207,6 @@ class ZKAsyncRegistry implements AsyncRegistry {
return future;
}
- @Override
- public CompletableFuture<Integer> getCurrentNrHRS() {
- return zk.exists(znodePaths.rsZNode).thenApply(s -> s != null ? s.getNumChildren() : 0);
- }
-
private static ZooKeeperProtos.Master getMasterProto(byte[] data) throws IOException {
if (data == null || data.length == 0) {
return null;
@@ -238,12 +230,6 @@ class ZKAsyncRegistry implements AsyncRegistry {
}
@Override
- public CompletableFuture<Integer> getMasterInfoPort() {
- return getAndConvert(znodePaths.masterAddressZNode, ZKAsyncRegistry::getMasterProto)
- .thenApply(proto -> proto != null ? proto.getInfoPort() : 0);
- }
-
- @Override
public void close() {
zk.close();
}
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/DoNothingAsyncRegistry.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/DoNothingAsyncRegistry.java
index 6633068..8c7b073 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/DoNothingAsyncRegistry.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/DoNothingAsyncRegistry.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -18,7 +18,6 @@
package org.apache.hadoop.hbase.client;
import java.util.concurrent.CompletableFuture;
-
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.RegionLocations;
import org.apache.hadoop.hbase.ServerName;
@@ -44,21 +43,11 @@ class DoNothingAsyncRegistry implements AsyncRegistry {
}
@Override
- public CompletableFuture<Integer> getCurrentNrHRS() {
- return CompletableFuture.completedFuture(0);
- }
-
- @Override
public CompletableFuture<ServerName> getMasterAddress() {
return CompletableFuture.completedFuture(null);
}
@Override
- public CompletableFuture<Integer> getMasterInfoPort() {
- return CompletableFuture.completedFuture(0);
- }
-
- @Override
public void close() {
}
}
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java
index 81dcc46..6afe0b5 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java
@@ -472,11 +472,6 @@ public class TestAsyncProcess {
public CompletableFuture<String> getClusterId() {
return CompletableFuture.completedFuture("testClusterId");
}
-
- @Override
- public CompletableFuture<Integer> getCurrentNrHRS() {
- return CompletableFuture.completedFuture(1);
- }
}
final AtomicInteger nbThreads = new AtomicInteger(0);
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientNoCluster.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientNoCluster.java
index c5858bd..19f98f1 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientNoCluster.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientNoCluster.java
@@ -144,11 +144,6 @@ public class TestClientNoCluster extends Configured implements Tool {
public CompletableFuture<String> getClusterId() {
return CompletableFuture.completedFuture(HConstants.CLUSTER_ID_DEFAULT);
}
-
- @Override
- public CompletableFuture<Integer> getCurrentNrHRS() {
- return CompletableFuture.completedFuture(1);
- }
}
/**
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java
index a891f66..e4b74df 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java
@@ -788,6 +788,13 @@ public class MiniHBaseCluster extends HBaseCluster {
}
/**
+ * @return Number of live region servers in the cluster currently.
+ */
+ public int getNumLiveRegionServers() {
+ return this.hbaseCluster.getLiveRegionServers().size();
+ }
+
+ /**
* @return List of region server threads. Does not return the master even though it is also
* a region server.
*/
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java
index c552fe6..b3b5b8b 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java
@@ -633,9 +633,9 @@ public class TestAdmin1 {
assertFalse(this.admin.tableExists(tableName));
}
- protected void verifyRoundRobinDistribution(ClusterConnection c, RegionLocator regionLocator, int
- expectedRegions) throws IOException {
- int numRS = c.getCurrentNrHRS();
+ private void verifyRoundRobinDistribution(RegionLocator regionLocator, int expectedRegions)
+ throws IOException {
+ int numRS = TEST_UTIL.getMiniHBaseCluster().getNumLiveRegionServers();
List<HRegionLocation> regions = regionLocator.getAllRegionLocations();
Map<ServerName, List<RegionInfo>> server2Regions = new HashMap<>();
for (HRegionLocation loc : regions) {
@@ -780,7 +780,7 @@ public class TestAdmin1 {
assertTrue(Bytes.equals(hri.getStartKey(), splitKeys[8]));
assertTrue(hri.getEndKey() == null || hri.getEndKey().length == 0);
- verifyRoundRobinDistribution(conn, l, expectedRegions);
+ verifyRoundRobinDistribution(l, expectedRegions);
}
@@ -841,7 +841,7 @@ public class TestAdmin1 {
assertTrue(Bytes.equals(hri.getStartKey(), new byte[] { 9, 9, 9, 9, 9, 9, 9, 9, 9, 9 }));
assertTrue(hri.getEndKey() == null || hri.getEndKey().length == 0);
- verifyRoundRobinDistribution(conn, l, expectedRegions);
+ verifyRoundRobinDistribution(l, expectedRegions);
}
// Try once more with something that divides into something infinite
@@ -865,7 +865,7 @@ public class TestAdmin1 {
"but only found " + regions.size(), expectedRegions, regions.size());
System.err.println("Found " + regions.size() + " regions");
- verifyRoundRobinDistribution(conn, l, expectedRegions);
+ verifyRoundRobinDistribution(l, expectedRegions);
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi.java
index 01341de..42d0118 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableAdminApi.java
@@ -22,8 +22,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-
-import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -52,7 +50,7 @@ import org.junit.runners.Parameterized;
/**
* Class to test asynchronous table admin operations.
* @see TestAsyncTableAdminApi2 This test and it used to be joined it was taking longer than our
- * ten minute timeout so they were split.
+ * ten minute timeout so they were split.
* @see TestAsyncTableAdminApi3 Another split out from this class so each runs under ten minutes.
*/
@RunWith(Parameterized.class)
@@ -268,9 +266,8 @@ public class TestAsyncTableAdminApi extends TestAsyncAdminBase {
}
}
- private void verifyRoundRobinDistribution(List<HRegionLocation> regions, int expectedRegions)
- throws IOException {
- int numRS = ((ClusterConnection) TEST_UTIL.getConnection()).getCurrentNrHRS();
+ private void verifyRoundRobinDistribution(List<HRegionLocation> regions, int expectedRegions) {
+ int numRS = TEST_UTIL.getMiniHBaseCluster().getNumLiveRegionServers();
Map<ServerName, List<RegionInfo>> server2Regions = new HashMap<>();
regions.stream().forEach((loc) -> {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestZKAsyncRegistry.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestZKAsyncRegistry.java
index 5a72dae..3e4ca94 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestZKAsyncRegistry.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestZKAsyncRegistry.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -25,7 +25,6 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
-
import java.io.IOException;
import java.util.concurrent.ExecutionException;
import java.util.stream.IntStream;
@@ -84,11 +83,8 @@ public class TestZKAsyncRegistry {
String expectedClusterId = TEST_UTIL.getHBaseCluster().getMaster().getClusterId();
assertEquals("Expected " + expectedClusterId + ", found=" + clusterId, expectedClusterId,
clusterId);
- assertEquals(TEST_UTIL.getHBaseCluster().getClusterMetrics().getLiveServerMetrics().size(),
- REGISTRY.getCurrentNrHRS().get().intValue());
assertEquals(TEST_UTIL.getHBaseCluster().getMaster().getServerName(),
REGISTRY.getMasterAddress().get());
- assertEquals(-1, REGISTRY.getMasterInfoPort().get().intValue());
RegionReplicaTestHelper
.waitUntilAllMetaReplicasHavingRegionLocation(TEST_UTIL.getConfiguration(), REGISTRY, 3);
RegionLocations locs = REGISTRY.getMetaRegionLocation().get();