(phoenix) branch PHOENIX-7562-feature-new updated: [Cosmetic] Fixing args order for upserting HA Group system table (#2404)

[tkhurana]

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

tkhurana pushed a commit to branch PHOENIX-7562-feature-new
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/PHOENIX-7562-feature-new by 
this push:
     new f5e71bf26c [Cosmetic] Fixing args order for upserting HA Group system 
table (#2404)
f5e71bf26c is described below

commit f5e71bf26c51a2996f27e4f3bb40ab37ba9d0e22
Author: ritegarg <58840065+riteg...@users.noreply.github.com>
AuthorDate: Fri Apr 10 09:33:42 2026 -0700

    [Cosmetic] Fixing args order for upserting HA Group system table (#2404)
---
 ...PhoenixRegionServerEndpointWithConsistentFailoverIT.java |  8 ++++----
 .../apache/phoenix/jdbc/HighAvailabilityTestingUtility.java | 13 +++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixRegionServerEndpointWithConsistentFailoverIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixRegionServerEndpointWithConsistentFailoverIT.java
index 5b1ad01958..77acd83a60 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixRegionServerEndpointWithConsistentFailoverIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PhoenixRegionServerEndpointWithConsistentFailoverIT.java
@@ -89,10 +89,10 @@ public class 
PhoenixRegionServerEndpointWithConsistentFailoverIT extends HABaseI
       CLUSTERS.getMasterAddress2(), ClusterRoleRecord.ClusterRole.ACTIVE,
       ClusterRoleRecord.ClusterRole.STANDBY, null, CLUSTERS.getHdfsUrl1(), 
CLUSTERS.getHdfsUrl2());
     
HAGroupStoreTestUtil.upsertHAGroupRecordInSystemTable(testName.getMethodName(),
-      CLUSTERS.getZkUrl2(), CLUSTERS.getZkUrl1(), CLUSTERS.getMasterAddress2(),
-      CLUSTERS.getMasterAddress1(), ClusterRoleRecord.ClusterRole.STANDBY,
-      ClusterRoleRecord.ClusterRole.ACTIVE, null, CLUSTERS.getHdfsUrl1(), 
CLUSTERS.getHdfsUrl2());
-
+      CLUSTERS.getZkUrl1(), CLUSTERS.getZkUrl2(), CLUSTERS.getMasterAddress1(),
+      CLUSTERS.getMasterAddress2(), ClusterRoleRecord.ClusterRole.ACTIVE,
+      ClusterRoleRecord.ClusterRole.STANDBY, CLUSTERS.getZkUrl2(),
+      CLUSTERS.getHdfsUrl1(), CLUSTERS.getHdfsUrl2());
   }
 
   @Test
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/jdbc/HighAvailabilityTestingUtility.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/jdbc/HighAvailabilityTestingUtility.java
index 16f80853e3..d27c5ba4f7 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/jdbc/HighAvailabilityTestingUtility.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/jdbc/HighAvailabilityTestingUtility.java
@@ -294,9 +294,9 @@ public class HighAvailabilityTestingUtility {
       HAGroupStoreTestUtil.upsertHAGroupRecordInSystemTable(haGroupName, 
getZkUrl1(), getZkUrl2(),
         getMasterAddress1(), getMasterAddress2(), role1, role2, version1, 
overrideZKUrl, policy,
         getHATestProperties(), getHdfsUrl1(), getHdfsUrl2());
-      HAGroupStoreTestUtil.upsertHAGroupRecordInSystemTable(haGroupName, 
getZkUrl2(), getZkUrl1(),
-        getMasterAddress2(), getMasterAddress1(), role2, role1, version2, 
overrideZKUrl, policy,
-        getHATestProperties(), getHdfsUrl2(), getHdfsUrl1());
+      HAGroupStoreTestUtil.upsertHAGroupRecordInSystemTable(haGroupName, 
getZkUrl1(), getZkUrl2(),
+        getMasterAddress1(), getMasterAddress2(), role1, role2, version1, 
getZkUrl2(), policy,
+        getHATestProperties(), getHdfsUrl1(), getHdfsUrl2());
     }
 
     /**
@@ -310,9 +310,10 @@ public class HighAvailabilityTestingUtility {
           getMasterAddress1(), getMasterAddress2(), role1, role2, version1, 
overrideZKUrl, policy,
           getHATestProperties(), getHdfsUrl1(), getHdfsUrl2());
       } else {
-        HAGroupStoreTestUtil.upsertHAGroupRecordInSystemTable(haGroupName, 
getZkUrl2(), getZkUrl1(),
-          getMasterAddress2(), getMasterAddress1(), role2, role1, version2, 
overrideZKUrl, policy,
-          getHATestProperties(), getHdfsUrl2(), getHdfsUrl1());
+        HAGroupStoreTestUtil.upsertHAGroupRecordInSystemTable(haGroupName, 
getZkUrl1(), getZkUrl2(),
+          getMasterAddress1(), getMasterAddress2(), role1, role2, version2,
+          overrideZKUrl != null ? overrideZKUrl : getZkUrl2(), policy, 
getHATestProperties(),
+          getHdfsUrl1(), getHdfsUrl2());
       }
     }