(accumulo) branch main updated: fixes MultipleManagerStartupWaitIT (#6308)

[kturner]

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

kturner pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/main by this push:
     new 771f5632e7 fixes MultipleManagerStartupWaitIT (#6308)
771f5632e7 is described below

commit 771f5632e7df447ddb82a1a233128133519584be
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Fri Apr 10 08:56:32 2026 -0700

    fixes MultipleManagerStartupWaitIT (#6308)
    
    This test was broken by changes in #6304 which made the way it got the
    primary manager addr incorrect. Modified the test to get the primary
    manager addr in another way.
---
 .../org/apache/accumulo/core/rpc/clients/ManagerClient.java | 13 +++++++++----
 .../apache/accumulo/test/MultipleManagerStartupWaitIT.java  | 12 +++++-------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/core/rpc/clients/ManagerClient.java 
b/core/src/main/java/org/apache/accumulo/core/rpc/clients/ManagerClient.java
index b044178fa4..3926dee884 100644
--- a/core/src/main/java/org/apache/accumulo/core/rpc/clients/ManagerClient.java
+++ b/core/src/main/java/org/apache/accumulo/core/rpc/clients/ManagerClient.java
@@ -35,10 +35,7 @@ import com.google.common.net.HostAndPort;
 
 public interface ManagerClient<C extends TServiceClient> {
 
-  default C getManagerConnection(Logger log, ThriftClientTypes<C> type, 
ClientContext context) {
-    checkArgument(context != null, "context is null");
-
-    // obtain the primary manager location
+  public static String getPrimaryManagerLocation(ClientContext context) {
     String managerLocation = null;
     ServiceLockPaths.ServiceLockPath m = 
context.getServerPaths().getManager(true);
     if (m != null) {
@@ -47,6 +44,14 @@ public interface ManagerClient<C extends TServiceClient> {
         managerLocation = 
sld.orElseThrow().getAddressString(ServiceLockData.ThriftService.MANAGER);
       }
     }
+    return managerLocation;
+  }
+
+  default C getManagerConnection(Logger log, ThriftClientTypes<C> type, 
ClientContext context) {
+    checkArgument(context != null, "context is null");
+
+    // obtain the primary manager location
+    String managerLocation = getPrimaryManagerLocation(context);
 
     if (managerLocation == null) {
       log.debug("No managers...");
diff --git 
a/test/src/main/java/org/apache/accumulo/test/MultipleManagerStartupWaitIT.java 
b/test/src/main/java/org/apache/accumulo/test/MultipleManagerStartupWaitIT.java
index cef6ac0535..1361f23450 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/MultipleManagerStartupWaitIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/MultipleManagerStartupWaitIT.java
@@ -26,9 +26,9 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.apache.accumulo.core.client.admin.servers.ServerId;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.lock.ServiceLockPaths.AddressSelector;
+import org.apache.accumulo.core.rpc.clients.ManagerClient;
 import org.apache.accumulo.minicluster.ServerType;
 import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl;
 import org.apache.accumulo.test.functional.ConfigurableMacBase;
@@ -104,12 +104,10 @@ public class MultipleManagerStartupWaitIT extends 
ConfigurableMacBase {
     // There is a time period where the primary manager has the lock but has 
not yet set the address
     // on the lock, when the address is not set an empty set would be 
returned. So this waits for
     // the address to be set.
-    Wait.waitFor(() -> !getCluster().getServerContext().instanceOperations()
-        .getServers(ServerId.Type.MANAGER).isEmpty());
-    Set<ServerId> primary =
-        
getCluster().getServerContext().instanceOperations().getServers(ServerId.Type.MANAGER);
-    assertEquals(1, primary.size());
-    
assertTrue(managerHosts.contains(primary.iterator().next().toHostPortString()));
+    Wait.waitFor(() -> 
ManagerClient.getPrimaryManagerLocation(cluster.getServerContext()) != null);
+    var primaryAddr = 
ManagerClient.getPrimaryManagerLocation(cluster.getServerContext());
+    assertTrue(managerHosts.contains(primaryAddr),
+        () -> "mangerHosts:" + managerHosts + " primaryAddr:" + primaryAddr);
     assertNull(startError.get());
     clusterThread.join();
   }