From 052b445b63d86045d1379ca78d40d922afaaa884 Mon Sep 17 00:00:00 2001 From: divneet-kaur Date: Fri, 19 Jul 2024 14:36:47 -0700 Subject: [PATCH 1/3] HBASE-28745 : Default Zookeeper ConnectionRegistry APIs timeout should be less --- .../apache/hadoop/hbase/zookeeper/TestReadOnlyZKClient.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestReadOnlyZKClient.java b/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestReadOnlyZKClient.java index bd835df4fc5d..b210a803d22a 100644 --- a/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestReadOnlyZKClient.java +++ b/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestReadOnlyZKClient.java @@ -217,9 +217,9 @@ public void testNotCloseZkWhenPending() throws Exception { @Test public void testReadWithTimeout() throws Exception { - assertArrayEquals(DATA, RO_ZK.get(PATH, 60000).get()); - assertEquals(CHILDREN, RO_ZK.exists(PATH, 60000).get().getNumChildren()); - List children = RO_ZK.list(PATH, 60000).get(); + assertArrayEquals(DATA, RO_ZK.get(PATH, 20000).get()); + assertEquals(CHILDREN, RO_ZK.exists(PATH, 20000).get().getNumChildren()); + List children = RO_ZK.list(PATH, 20000).get(); assertEquals(CHILDREN, children.size()); Collections.sort(children); for (int i = 0; i < CHILDREN; i++) { From 18e6eda02408a6e7643854e8e26602990fad49ea Mon Sep 17 00:00:00 2001 From: divneet-kaur Date: Fri, 19 Jul 2024 14:38:38 -0700 Subject: [PATCH 2/3] updated zk connection registry time --- .../org/apache/hadoop/hbase/client/ZKConnectionRegistry.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKConnectionRegistry.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKConnectionRegistry.java index e356b095e248..fedf7357216e 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKConnectionRegistry.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKConnectionRegistry.java @@ -75,7 +75,7 @@ class ZKConnectionRegistry implements ConnectionRegistry { private final Configuration conf; private final int zkRegistryAsyncTimeout; public static final String ZK_REGISTRY_ASYNC_GET_TIMEOUT = "zookeeper.registry.async.get.timeout"; - public static final int DEFAULT_ZK_REGISTRY_ASYNC_GET_TIMEOUT = 60000; // 1 min + public static final int DEFAULT_ZK_REGISTRY_ASYNC_GET_TIMEOUT = 20000; // 20 sec // User not used, but for rpc based registry we need it ZKConnectionRegistry(Configuration conf, User ignored) { From 241bf814c659fee73eba3fa8b2f3bc25fef0a5a1 Mon Sep 17 00:00:00 2001 From: divneet-kaur Date: Fri, 19 Jul 2024 14:46:00 -0700 Subject: [PATCH 3/3] changed default time to 10 sec --- .../apache/hadoop/hbase/client/ZKConnectionRegistry.java | 2 +- .../apache/hadoop/hbase/zookeeper/TestReadOnlyZKClient.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKConnectionRegistry.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKConnectionRegistry.java index fedf7357216e..ae2b657b2bfe 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKConnectionRegistry.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKConnectionRegistry.java @@ -75,7 +75,7 @@ class ZKConnectionRegistry implements ConnectionRegistry { private final Configuration conf; private final int zkRegistryAsyncTimeout; public static final String ZK_REGISTRY_ASYNC_GET_TIMEOUT = "zookeeper.registry.async.get.timeout"; - public static final int DEFAULT_ZK_REGISTRY_ASYNC_GET_TIMEOUT = 20000; // 20 sec + public static final int DEFAULT_ZK_REGISTRY_ASYNC_GET_TIMEOUT = 10000; // 10 sec // User not used, but for rpc based registry we need it ZKConnectionRegistry(Configuration conf, User ignored) { diff --git a/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestReadOnlyZKClient.java b/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestReadOnlyZKClient.java index b210a803d22a..5f423c5be61f 100644 --- a/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestReadOnlyZKClient.java +++ b/hbase-zookeeper/src/test/java/org/apache/hadoop/hbase/zookeeper/TestReadOnlyZKClient.java @@ -217,9 +217,9 @@ public void testNotCloseZkWhenPending() throws Exception { @Test public void testReadWithTimeout() throws Exception { - assertArrayEquals(DATA, RO_ZK.get(PATH, 20000).get()); - assertEquals(CHILDREN, RO_ZK.exists(PATH, 20000).get().getNumChildren()); - List children = RO_ZK.list(PATH, 20000).get(); + assertArrayEquals(DATA, RO_ZK.get(PATH, 10000).get()); + assertEquals(CHILDREN, RO_ZK.exists(PATH, 10000).get().getNumChildren()); + List children = RO_ZK.list(PATH, 10000).get(); assertEquals(CHILDREN, children.size()); Collections.sort(children); for (int i = 0; i < CHILDREN; i++) {