From 1857679b6ce5479f07726967587616dc9f7f1327 Mon Sep 17 00:00:00 2001 From: chenhang Date: Wed, 6 Dec 2023 11:02:52 +0800 Subject: [PATCH 1/2] Skip testBookieServerZKSessionExpireBehaviour test due to flaky --- .../java/org/apache/bookkeeper/test/BookieZKExpireTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieZKExpireTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieZKExpireTest.java index 8713756edaf..af9b17312f6 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieZKExpireTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieZKExpireTest.java @@ -36,6 +36,7 @@ import org.apache.bookkeeper.proto.BookieServer; import org.apache.bookkeeper.stats.NullStatsLogger; import org.apache.bookkeeper.util.PortManager; +import org.junit.Ignore; import org.junit.Test; /** @@ -122,6 +123,7 @@ conf, new TestBookieImpl(conf), will fail (even if retry it many times). */ @Test + @Ignore @SuppressWarnings("deprecation") public void testBookieServerZKSessionExpireBehaviour() throws Exception { // 6000 is minimum due to default tick time From cee032b5a5f1ae9b4969cd95ebbab2ff73c95257 Mon Sep 17 00:00:00 2001 From: chenhang Date: Wed, 6 Dec 2023 12:42:14 +0800 Subject: [PATCH 2/2] Use @Flaky flage instead of @Ignore --- .../java/org/apache/bookkeeper/test/BookieZKExpireTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieZKExpireTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieZKExpireTest.java index af9b17312f6..808b7e8f900 100644 --- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieZKExpireTest.java +++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieZKExpireTest.java @@ -32,11 +32,11 @@ import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.bookie.MockUncleanShutdownDetection; import org.apache.bookkeeper.bookie.TestBookieImpl; +import org.apache.bookkeeper.common.testing.annotations.FlakyTest; import org.apache.bookkeeper.conf.ServerConfiguration; import org.apache.bookkeeper.proto.BookieServer; import org.apache.bookkeeper.stats.NullStatsLogger; import org.apache.bookkeeper.util.PortManager; -import org.junit.Ignore; import org.junit.Test; /** @@ -122,8 +122,7 @@ conf, new TestBookieImpl(conf), Attempt to reconnect by BookieStateManager's RegistrationManager listener will fail (even if retry it many times). */ - @Test - @Ignore + @FlakyTest(value = "https://github.com/apache/bookkeeper/issues/4142") @SuppressWarnings("deprecation") public void testBookieServerZKSessionExpireBehaviour() throws Exception { // 6000 is minimum due to default tick time