[phoenix] branch 5.1 updated: PHOENIX-7048 SaltedTableMergeBucketsIT very flakey on 5.1 with Hbase 2.1 and 2.2

[stoty]

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

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
     new 3b974023cb PHOENIX-7048 SaltedTableMergeBucketsIT very flakey on 5.1 
with Hbase 2.1 and 2.2
3b974023cb is described below

commit 3b974023cbce09c71f825155cbf4997d46607a02
Author: Istvan Toth <st...@apache.org>
AuthorDate: Mon Oct 2 10:32:11 2023 +0200

    PHOENIX-7048 SaltedTableMergeBucketsIT very flakey on 5.1 with Hbase 2.1 
and 2.2
---
 .../org/apache/phoenix/end2end/salted/SaltedTableMergeBucketsIT.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableMergeBucketsIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableMergeBucketsIT.java
index 01fc614836..87da6c63f7 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableMergeBucketsIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/salted/SaltedTableMergeBucketsIT.java
@@ -22,6 +22,7 @@ import static 
org.apache.phoenix.util.TestUtil.assertResultSet;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -41,6 +42,7 @@ import java.util.stream.IntStream;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.Admin;
 import org.apache.hadoop.hbase.client.RegionInfo;
+import org.apache.hadoop.hbase.util.VersionInfo;
 import org.apache.phoenix.end2end.ParallelStatsEnabledIT;
 import org.apache.phoenix.end2end.ParallelStatsEnabledTest;
 import org.apache.phoenix.query.QueryServices;
@@ -280,6 +282,8 @@ public class SaltedTableMergeBucketsIT extends 
ParallelStatsEnabledIT {
     }
 
     public void mergeRegions(String testTableName) throws Exception {
+        // Merge seems to have problems on Hbase 2.1 and 2.2
+        assumeTrue(VersionInfo.compareVersion(VersionInfo.getVersion(), "2.3") 
>= 0);
         Admin admin =
                 driver.getConnectionQueryServices(getUrl(), 
TestUtil.TEST_PROPERTIES).getAdmin();
         List<RegionInfo> regions = 
admin.getRegions(TableName.valueOf(testTableName));