(phoenix) branch master updated: PHOENIX-7493 (Addendum) Graceful Failover with Phoenix HA - Integ Test Stability (#2108)

[jisaac]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new beeb8974a4 PHOENIX-7493 (Addendum) Graceful Failover with Phoenix HA - 
Integ Test Stability (#2108)
beeb8974a4 is described below

commit beeb8974a4059a7b2b51e537515af0194c08cf6d
Author: ritegarg <58840065+riteg...@users.noreply.github.com>
AuthorDate: Fri Apr 11 12:26:29 2025 -0700

    PHOENIX-7493 (Addendum) Graceful Failover with Phoenix HA - Integ Test 
Stability (#2108)
    
    * PHOENIX-7493 Graceful Failover with Phoenix HA - Integ Test Stability
    
    * PHOENIX-7493. Graceful Failover with Phoenix HA
    
    ---------
    
    Co-authored-by: Ritesh Garg 
<ritesh.g...@riteshg-ltmd34g.internal.salesforce.com>
---
 .../src/main/java/org/apache/phoenix/jdbc/HAGroupStoreClient.java     | 2 +-
 .../src/it/java/org/apache/phoenix/jdbc/HAGroupStoreClientIT.java     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/HAGroupStoreClient.java
 
b/phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/HAGroupStoreClient.java
index 05f4247ace..c3606ddad2 100644
--- 
a/phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/HAGroupStoreClient.java
+++ 
b/phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/HAGroupStoreClient.java
@@ -202,6 +202,6 @@ public class HAGroupStoreClient implements Closeable {
         if (!isHealthy) {
             throw new IOException("HAGroupStoreClient is not healthy");
         }
-        return clusterRoleToCRRMap.getOrDefault(clusterRole, new 
ConcurrentHashMap<>()).values().stream().collect(ImmutableList.toImmutableList());
+        return 
ImmutableList.copyOf(clusterRoleToCRRMap.getOrDefault(clusterRole, new 
ConcurrentHashMap<>()).values());
     }
 }
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/jdbc/HAGroupStoreClientIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/jdbc/HAGroupStoreClientIT.java
index cd0679e9c2..5a382f77e8 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/jdbc/HAGroupStoreClientIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/jdbc/HAGroupStoreClientIT.java
@@ -50,7 +50,7 @@ import static org.junit.Assert.assertThrows;
 public class HAGroupStoreClientIT extends BaseTest {
 
     private final PhoenixHAAdmin haAdmin = new PhoenixHAAdmin(config);
-    private static final Long ZK_CURATOR_EVENT_PROPAGATION_TIMEOUT_MS = 1000L;
+    private static final Long ZK_CURATOR_EVENT_PROPAGATION_TIMEOUT_MS = 5000L;
 
     @BeforeClass
     public static synchronized void doSetup() throws Exception {
@@ -365,7 +365,7 @@ public class HAGroupStoreClientIT extends BaseTest {
     @Test
     public void testHAGroupStoreClientWithMultiThreadedUpdates() throws 
Exception {
         // Number of threads to execute
-        int threadCount = 15;
+        int threadCount = 5;
 
         // Capture versions of crr in a list(crrEventVersions)  in order they 
are received.
         List<Integer> crrEventVersions = new ArrayList<>();