[hbase] branch master updated: HBASE-22234 Fix flaky TestHbck#testRecoverSplitAfterMetaUpdated

[tianjy]

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

tianjy 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 cb84b27  HBASE-22234 Fix flaky 
TestHbck#testRecoverSplitAfterMetaUpdated
cb84b27 is described below

commit cb84b2788aeed6aad2bc4b1acb98290e060861e2
Author: tianjingyun <tianjy1...@gmail.com>
AuthorDate: Sun Apr 14 21:59:59 2019 +0800

    HBASE-22234 Fix flaky TestHbck#testRecoverSplitAfterMetaUpdated
---
 .../src/test/java/org/apache/hadoop/hbase/client/TestHbck.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHbck.java 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHbck.java
index 8ee00b8..d9a7ca9 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHbck.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHbck.java
@@ -253,7 +253,7 @@ public class TestHbck {
       Assert.assertEquals(1, result.size());
       hbck.assigns(Arrays.asList(result.keySet().toArray(new 
String[0])).stream()
           .map(regionName -> 
regionName.split("\\.")[1]).collect(Collectors.toList()));
-      
ProcedureTestingUtility.waitNoProcedureRunning(master.getMasterProcedureExecutor());
+      
ProcedureTestingUtility.waitAllProcedures(master.getMasterProcedureExecutor());
       // now the state should be fixed
       result = 
hbck.getFailedSplitMergeLegacyRegions(Arrays.asList(TableName.valueOf(testTable)));
       Assert.assertEquals(0, result.size());
@@ -290,7 +290,7 @@ public class TestHbck {
       Assert.assertEquals(2, result.size());
       hbck.assigns(Arrays.asList(result.keySet().toArray(new 
String[0])).stream()
           .map(regionName -> 
regionName.split("\\.")[1]).collect(Collectors.toList()));
-      
ProcedureTestingUtility.waitNoProcedureRunning(master.getMasterProcedureExecutor());
+      
ProcedureTestingUtility.waitAllProcedures(master.getMasterProcedureExecutor());
       // now the state should be fixed
       result = 
hbck.getFailedSplitMergeLegacyRegions(Arrays.asList(TableName.valueOf(testTable)));
       Assert.assertEquals(0, result.size());
@@ -310,7 +310,7 @@ public class TestHbck {
       Assert.assertEquals(2, result.size());
       hbck.assigns(Arrays.asList(result.keySet().toArray(new 
String[0])).stream()
           .map(regionName -> 
regionName.split("\\.")[1]).collect(Collectors.toList()));
-      
ProcedureTestingUtility.waitNoProcedureRunning(master.getMasterProcedureExecutor());
+      
ProcedureTestingUtility.waitAllProcedures(master.getMasterProcedureExecutor());
       // now the state should be fixed
       result = 
hbck.getFailedSplitMergeLegacyRegions(Arrays.asList(TableName.valueOf(testTable)));
       Assert.assertEquals(0, result.size());