This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.6 by this push:
new d01d1ffccfd HBASE-28554 TestZooKeeperScanPolicyObserver and
TestAdminShell fail 100% of times on flaky dashboard (#5859)
d01d1ffccfd is described below
commit d01d1ffccfd9dcfb2c276c2fb9f13e1ab2ca6e9f
Author: Duo Zhang <zhang...@apache.org>
AuthorDate: Sun Apr 28 22:45:52 2024 +0800
HBASE-28554 TestZooKeeperScanPolicyObserver and TestAdminShell fail 100% of
times on flaky dashboard (#5859)
Signed-off-by: Bryan Beaudreault <bbeaudrea...@apache.org>
(cherry picked from commit 4230c42b402f909be9e90e71ae62c5778a14100c)
---
.../coprocessor/example/TestZooKeeperScanPolicyObserver.java | 8 +++++++-
hbase-shell/src/main/ruby/hbase/admin.rb | 2 --
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git
a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestZooKeeperScanPolicyObserver.java
b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestZooKeeperScanPolicyObserver.java
index cf06f38d194..569c429b5ac 100644
---
a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestZooKeeperScanPolicyObserver.java
+++
b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestZooKeeperScanPolicyObserver.java
@@ -33,6 +33,7 @@ import
org.apache.hadoop.hbase.testclassification.CoprocessorTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
+import org.apache.hadoop.hbase.zookeeper.RecoverableZooKeeper;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.ZooDefs;
@@ -83,7 +84,12 @@ public class TestZooKeeperScanPolicyObserver {
private void setExpireBefore(long time)
throws KeeperException, InterruptedException, IOException {
- ZooKeeper zk =
UTIL.getZooKeeperWatcher().getRecoverableZooKeeper().getZooKeeper();
+ RecoverableZooKeeper recoverableZk =
UTIL.getZooKeeperWatcher().getRecoverableZooKeeper();
+ // we need to call this for setting up the zookeeper connection
+ recoverableZk.reconnectAfterExpiration();
+ // we have to use the original ZooKeeper as the RecoverableZooKeeper will
append a magic prefix
+ // for the data stored on zookeeper
+ ZooKeeper zk = recoverableZk.getZooKeeper();
if (zk.exists(ZooKeeperScanPolicyObserver.NODE, false) == null) {
zk.create(ZooKeeperScanPolicyObserver.NODE, Bytes.toBytes(time),
ZooDefs.Ids.OPEN_ACL_UNSAFE,
CreateMode.PERSISTENT);
diff --git a/hbase-shell/src/main/ruby/hbase/admin.rb
b/hbase-shell/src/main/ruby/hbase/admin.rb
index a037aa480b2..69994c903d7 100644
--- a/hbase-shell/src/main/ruby/hbase/admin.rb
+++ b/hbase-shell/src/main/ruby/hbase/admin.rb
@@ -460,8 +460,6 @@ module Hbase
'admin',
nil
)
- zk = @zk_wrapper.getRecoverableZooKeeper.getZooKeeper
- @zk_main = org.apache.zookeeper.ZooKeeperMain.new(zk)
org.apache.hadoop.hbase.zookeeper.ZKDump.dump(@zk_wrapper)
end
