From 918dd2df4b3618f449b40f0ccdc618b3803d1458 Mon Sep 17 00:00:00 2001 From: ukumawat Date: Tue, 9 Dec 2025 18:15:37 +0530 Subject: [PATCH 1/2] PHOENIX-7741 Remove usage of isRegionInTransition method from phoenix tests --- .../it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java b/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java index 2c1752ba028..cf28b9e9ee1 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java @@ -243,11 +243,13 @@ private void ensureTablesOnDifferentRegionServers(String tableName1, String tabl } byte[] encodedRegionNameInBytes = hri2.getEncodedNameAsBytes(); admin.move(encodedRegionNameInBytes, dstServer.getServerName()); + // verify that both HMaster and Region server are aware of this movement while ( dstServer.getOnlineRegion(hri2.getRegionName()) == null || dstServer.getRegionsInTransitionInRS().containsKey(encodedRegionNameInBytes) || srcServer.getRegionsInTransitionInRS().containsKey(encodedRegionNameInBytes) - || master.getAssignmentManager().getRegionStates().isRegionInTransition(hri2) + || !ServerName.isSameAddress(master.getAssignmentManager().getRegionStates().getRegionServerOfRegion(hri2), + dstServer.getServerName()) ) { // wait for the move to be finished Thread.sleep(1); From 2ffd16b353d1f5a3683a500c3eab0240fa1e1f0b Mon Sep 17 00:00:00 2001 From: ukumawat Date: Tue, 9 Dec 2025 22:58:34 +0530 Subject: [PATCH 2/2] PHOENIX-7741 spotless apply --- .../src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java b/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java index cf28b9e9ee1..3dc82388552 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java @@ -248,7 +248,8 @@ private void ensureTablesOnDifferentRegionServers(String tableName1, String tabl dstServer.getOnlineRegion(hri2.getRegionName()) == null || dstServer.getRegionsInTransitionInRS().containsKey(encodedRegionNameInBytes) || srcServer.getRegionsInTransitionInRS().containsKey(encodedRegionNameInBytes) - || !ServerName.isSameAddress(master.getAssignmentManager().getRegionStates().getRegionServerOfRegion(hri2), + || !ServerName.isSameAddress( + master.getAssignmentManager().getRegionStates().getRegionServerOfRegion(hri2), dstServer.getServerName()) ) { // wait for the move to be finished