You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by sa...@apache.org on 2020/02/22 00:19:41 UTC
[hbase] branch branch-1.3 updated: HBASE-23862 Fix flaky
TestSnapshotFromMaster in 1.x versions (#1190)
This is an automated email from the ASF dual-hosted git repository.
sakthi pushed a commit to branch branch-1.3
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-1.3 by this push:
new 25db826 HBASE-23862 Fix flaky TestSnapshotFromMaster in 1.x versions (#1190)
25db826 is described below
commit 25db826693c9edfd47f3c2a4d84f6c85e4873777
Author: Sakthi <sa...@apache.org>
AuthorDate: Fri Feb 21 16:18:54 2020 -0800
HBASE-23862 Fix flaky TestSnapshotFromMaster in 1.x versions (#1190)
Backport HBASE-23658 - Fix flaky TestSnapshotFromMaster
(cherry picked from commit 48494c822ecc0d59fb7ca6d3c95a6d056bb9c027)
Signed-off-by: Guanghao Zhang <zg...@gmail.com>
Signed-off-by: Viraj Jasani <vi...@gmail.com>
---
.../hadoop/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 0f2c85d..0959b0f 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<Exception>() {
+ @Override
+ public boolean evaluate() throws Exception {
+ return !master.getSnapshotManager().isTakingAnySnapshot();
+ }
+ });
}
}