[hbase] branch master updated: HBASE-25400 [Flakey Tests] branch-2 TestRegionMoveAndAbandon

[st...@apache.org]

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

stack pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/master by this push:
     new 888a4fb  HBASE-25400 [Flakey Tests] branch-2 TestRegionMoveAndAbandon
888a4fb is described below

commit 888a4fb86a3a72636a699f2c8ef968adac081545
Author: stack <st...@apache.org>
AuthorDate: Tue Dec 15 21:02:45 2020 -0800

    HBASE-25400 [Flakey Tests] branch-2 TestRegionMoveAndAbandon
---
 .../hadoop/hbase/master/assignment/TestRegionMoveAndAbandon.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRegionMoveAndAbandon.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRegionMoveAndAbandon.java
index 45e9d01..cc8335a 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRegionMoveAndAbandon.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRegionMoveAndAbandon.java
@@ -103,8 +103,9 @@ public class TestRegionMoveAndAbandon {
     LOG.info("Killing RS {}", rs1.getServerName());
     // Stop RS1
     cluster.killRegionServer(rs1.getServerName());
+    UTIL.waitFor(30_000, () -> rs1.isStopped() && !rs1.isAlive());
     // Region should get moved to RS2
-    UTIL.waitTableAvailable(tableName, 30_000);
+    UTIL.waitTableAvailable(tableName, 60_000);
     // Restart the master
     LOG.info("Killing master {}", cluster.getMaster().getServerName());
     cluster.killMaster(cluster.getMaster().getServerName());