[hbase] branch branch-2.2 updated: HBASE-23658 Fix flaky TestSnapshotFromMaster (#998)

[zghao]

This is an automated email from the ASF dual-hosted git repository.

zghao pushed a commit to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2.2 by this push:
     new ca13eec  HBASE-23658 Fix flaky TestSnapshotFromMaster (#998)
ca13eec is described below

commit ca13eec9fbfdb521f07b399937280721b8fcf49d
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 <zhang...@apache.org>
---
 .../apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java   | 5 +----
 1 file changed, 1 insertion(+), 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 cc2ee06..f4d7911 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;
 
@@ -440,8 +439,6 @@ public class TestSnapshotFromMaster {
         snapshotName, TABLE_NAME, SnapshotType.FLUSH));
     Waiter.waitFor(UTIL.getConfiguration(), 10 * 1000L, 200L,
       () -> 
UTIL.getAdmin().listSnapshots(Pattern.compile(snapshotName)).size() == 1);
-    assertTrue(master.getSnapshotManager().isTakingAnySnapshot());
-    Thread.sleep(11 * 1000L);
-    assertFalse(master.getSnapshotManager().isTakingAnySnapshot());
+    UTIL.waitFor(30000, () -> 
!master.getSnapshotManager().isTakingAnySnapshot());
   }
 }