You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by wc...@apache.org on 2021/08/18 15:42:23 UTC
[hbase] branch branch-2 updated: Amend HBASE-26187 UTs,
adding a check for Split procedure completion before proceeding
with test logic. (#3598)
This is an automated email from the ASF dual-hosted git repository.
wchevreuil pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new f2f99ae Amend HBASE-26187 UTs, adding a check for Split procedure completion before proceeding with test logic. (#3598)
f2f99ae is described below
commit f2f99aea34fb4a500117d5fcd11a112b98c52187
Author: Wellington Ramos Chevreuil <wc...@apache.org>
AuthorDate: Wed Aug 18 15:39:00 2021 +0100
Amend HBASE-26187 UTs, adding a check for Split procedure completion before proceeding with test logic. (#3598)
Signed-off-by: Duo Zhang <zh...@apache.org>
(cherry picked from commit f2e2140b574123fa871599603cbbba8ba145e1b9)
---
.../regionserver/TestDirectStoreSplitsMerges.java | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDirectStoreSplitsMerges.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDirectStoreSplitsMerges.java
index 1b1cecc..888ab53 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDirectStoreSplitsMerges.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDirectStoreSplitsMerges.java
@@ -208,17 +208,19 @@ public class TestDirectStoreSplitsMerges {
}
private void waitForSplitProcComplete(int attempts, int waitTime) throws Exception {
- Procedure
- splitProc = TEST_UTIL.getHBaseCluster().getMaster().getProcedures().stream().findFirst().
- filter( p -> p instanceof SplitTableRegionProcedure).get();
- int count = 0;
- while((splitProc.isWaiting()||splitProc.isRunnable())&&count<attempts){
- synchronized (splitProc) {
- splitProc.wait(waitTime);
+ List<Procedure<?>> procedures = TEST_UTIL.getHBaseCluster().getMaster().getProcedures();
+ if(procedures.size()>0) {
+ Procedure splitProc = procedures.stream().
+ filter(p -> p instanceof SplitTableRegionProcedure).findFirst().get();
+ int count = 0;
+ while ((splitProc.isWaiting() || splitProc.isRunnable()) && count < attempts) {
+ synchronized (splitProc) {
+ splitProc.wait(waitTime);
+ }
+ count++;
}
- count++;
+ assertTrue(splitProc.isSuccess());
}
- assertTrue(splitProc.isSuccess());
}
private void mergeFileFromRegion(HRegionFileSystem regionFS, HRegion regionToMerge,