From ce0b9433a4a57fc72eabee70f13fe05757783f99 Mon Sep 17 00:00:00 2001 From: Sakthi Date: Wed, 19 Feb 2020 20:01:09 -0800 Subject: [PATCH] HBASE-23862 Fix flaky TestSnapshotFromMaster in 1.x versions (#1181) Backport HBASE-23658 - Fix flaky TestSnapshotFromMaster (cherry picked from commit 25654df98b939f077cb8e06f46c9c28705f86b84) Signed-off-by: Guanghao Zhang --- .../hbase/master/cleaner/TestSnapshotFromMaster.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java index 0f2c85d0fc434e99a9b43b5425a7959e9692babe..0959b0ffbabaa5b3d5a3c2094dfbf08dd83d44b5 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java @@ -18,7 +18,6 @@ package org.apache.hadoop.hbase.master.cleaner; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -426,8 +425,11 @@ public class TestSnapshotFromMaster { return UTIL.getHBaseAdmin().listSnapshots(Pattern.compile(snapshotName)).size() == 1; } }); - assertTrue(master.getSnapshotManager().isTakingAnySnapshot()); - Thread.sleep(11 * 1000L); - assertFalse(master.getSnapshotManager().isTakingAnySnapshot()); + UTIL.waitFor(30000, new Predicate() { + @Override + public boolean evaluate() throws Exception { + return !master.getSnapshotManager().isTakingAnySnapshot(); + } + }); } } -- 2.20.1 (Apple Git-117)