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/20 03:51:17 UTC
[hbase] branch branch-1 updated: HBASE-23862 Fix flaky
TestSnapshotFromMaster in 1.x versions (#1181)
This is an automated email from the ASF dual-hosted git repository.
sakthi pushed a commit to branch branch-1
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-1 by this push:
new 25654df HBASE-23862 Fix flaky TestSnapshotFromMaster in 1.x versions (#1181)
25654df is described below
commit 25654df98b939f077cb8e06f46c9c28705f86b84
Author: Sakthi <sa...@apache.org>
AuthorDate: Wed Feb 19 19:51:07 2020 -0800
HBASE-23862 Fix flaky TestSnapshotFromMaster in 1.x versions (#1181)
Backport HBASE-23658 - Fix flaky TestSnapshotFromMaster
(cherry picked from commit e750d2c7af03bfcb85422077cf59ab4b1815cb12)
Signed-off-by: Guanghao Zhang <zg...@gmail.com>
---
.../hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java | 11 +++++++----
1 file changed, 7 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 de1f31a..fa97a03 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
@@ -365,7 +365,7 @@ public class TestSnapshotFromMaster {
isSnapshotCleanupEnabledResponse =
master.getMasterRpcServices().isSnapshotCleanupEnabled(null,
isSnapshotCleanupEnabledRequest);
- Assert.assertFalse(isSnapshotCleanupEnabledResponse.getEnabled());
+ assertFalse(isSnapshotCleanupEnabledResponse.getEnabled());
}
/**
@@ -530,8 +530,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();
+ }
+ });
}
}