From 4de06915b8739a726acc59354fa6dbad68b2d3d6 Mon Sep 17 00:00:00 2001 From: Bharath Vissapragada Date: Sat, 1 Feb 2020 15:12:34 -0800 Subject: [PATCH] HBASE-23764: Switch to IP address for ZK ensemble #1106 Tests showed that using IP address is much faster for mini cluster and a lot less flakier. See the jira for more details. --- hbase-common/src/main/resources/hbase-default.xml | 5 ++++- .../org/apache/hadoop/hbase/client/TestZKAsyncRegistry.java | 2 +- .../org/apache/hadoop/hbase/master/TestMasterNoCluster.java | 4 ++-- .../org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java | 2 +- .../org/apache/hadoop/hbase/zookeeper/TestZKMainServer.java | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml index f611a2b2fbc..8fda74d047e 100644 --- a/hbase-common/src/main/resources/hbase-default.xml +++ b/hbase-common/src/main/resources/hbase-default.xml @@ -72,7 +72,10 @@ possible configurations would overwhelm and obscure the important. hbase.zookeeper.quorum - localhost + + 127.0.0.1 Comma separated list of servers in the ZooKeeper ensemble (This config. should have been named hbase.zookeeper.ensemble). For example, "host1.mydomain.com,host2.mydomain.com,host3.mydomain.com". 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 3e4ca94eca9..88de0082e7f 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 @@ -101,7 +101,7 @@ public class TestZKAsyncRegistry { public void testIndependentZKConnections() throws IOException { try (ReadOnlyZKClient zk1 = REGISTRY.getZKClient()) { Configuration otherConf = new Configuration(TEST_UTIL.getConfiguration()); - otherConf.set(HConstants.ZOOKEEPER_QUORUM, "127.0.0.1"); + otherConf.set(HConstants.ZOOKEEPER_QUORUM, "localhost"); try (ZKAsyncRegistry otherRegistry = new ZKAsyncRegistry(otherConf)) { ReadOnlyZKClient zk2 = otherRegistry.getZKClient(); assertNotSame("Using a different configuration / quorum should result in different " + diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java index 15b14b4f7b9..e05140ba9d0 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java @@ -19,7 +19,7 @@ package org.apache.hadoop.hbase.master; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; - +import static org.apache.hadoop.hbase.HConstants.ZOOKEEPER_QUORUM; import java.io.IOException; import java.net.InetAddress; import java.net.UnknownHostException; @@ -312,7 +312,7 @@ public class TestMasterNoCluster { @Test public void testMasterInitWithSameClientServerZKQuorum() throws Exception { Configuration conf = new Configuration(TESTUTIL.getConfiguration()); - conf.set(HConstants.CLIENT_ZOOKEEPER_QUORUM, HConstants.LOCALHOST); + conf.set(HConstants.CLIENT_ZOOKEEPER_QUORUM, conf.get(ZOOKEEPER_QUORUM)); conf.setInt(HConstants.CLIENT_ZOOKEEPER_CLIENT_PORT, TESTUTIL.getZkCluster().getClientPort()); HMaster master = new HMaster(conf); master.start(); diff --git a/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java b/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java index d1ed3919483..263986dc0a2 100644 --- a/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java +++ b/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java @@ -74,7 +74,7 @@ public class TestHQuorumPeer { assertEquals(dataDir.toString(), (String)properties.get("dataDir")); assertEquals(Integer.valueOf(PORT_NO), Integer.valueOf(properties.getProperty("clientPort"))); - assertEquals("localhost:2888:3888", properties.get("server.0")); + assertEquals("127.0.0.1:2888:3888", properties.get("server.0")); assertNull(properties.get("server.1")); String oldValue = conf.get(HConstants.ZOOKEEPER_QUORUM); diff --git a/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKMainServer.java b/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKMainServer.java index 7786889be90..98262a9213a 100644 --- a/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKMainServer.java +++ b/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKMainServer.java @@ -101,7 +101,7 @@ public class TestZKMainServer { public void testHostPortParse() { ZKMainServer parser = new ZKMainServer(); Configuration c = HBaseConfiguration.create(); - assertEquals("localhost:" + c.get(HConstants.ZOOKEEPER_CLIENT_PORT), parser.parse(c)); + assertEquals("127.0.0.1:" + c.get(HConstants.ZOOKEEPER_CLIENT_PORT), parser.parse(c)); final String port = "1234"; c.set(HConstants.ZOOKEEPER_CLIENT_PORT, port); c.set("hbase.zookeeper.quorum", "example.com");