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/17 20:45:44 UTC
[hbase] 01/01: HBASE-23658 Fix flaky TestSnapshotFromMaster (#998)
This is an automated email from the ASF dual-hosted git repository.
sakthi pushed a commit to branch HBASE-23862
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 5bfdc5cf2f6f98c3e3e9b36e989406dfaf745a13
Author: Guanghao Zhang <zg...@apache.org>
AuthorDate: Thu Jan 9 14:38:52 2020 +0800
HBASE-23658 Fix flaky TestSnapshotFromMaster (#998)
Signed-off-by: Duo Zhang <zh...@apache.org>
(cherry picked from commit e750d2c7af03bfcb85422077cf59ab4b1815cb12)
---
.../apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java | 6 ++----
1 file changed, 2 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..298ef763 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,6 @@ 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, () -> !master.getSnapshotManager().isTakingAnySnapshot());
}
}