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 21:16:44 UTC
[hbase] branch HBASE-23862 updated (5bfdc5c -> a787e9d)
This is an automated email from the ASF dual-hosted git repository.
sakthi pushed a change to branch HBASE-23862
in repository https://gitbox.apache.org/repos/asf/hbase.git.
discard 5bfdc5c HBASE-23658 Fix flaky TestSnapshotFromMaster (#998)
new a787e9d HBASE-23658 Fix flaky TestSnapshotFromMaster (#998)
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (5bfdc5c)
\
N -- N -- N refs/heads/HBASE-23862 (a787e9d)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
[hbase] 01/01: HBASE-23658 Fix flaky TestSnapshotFromMaster (#998)
Posted by sa...@apache.org.
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 a787e9d806b192f33ccb59d169c620ea81b93b4a
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)
---
.../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..b1ca65d 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 UTIL.getHBaseAdmin().listSnapshots(Pattern.compile(snapshotName)).size() == 1;
+ }
+ });
}
}