(accumulo) 01/02: Merge branch '2.1'

[dlmarion]

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

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

commit 7956409a5a8a0a2c7f87ef9be75ad42441d152ba
Merge: f7cc0fe8e6 21139f63c6
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Thu Jul 9 19:06:08 2026 +0000

    Merge branch '2.1'

 .../java/org/apache/accumulo/test/functional/GracefulShutdownIT.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --cc 
test/src/main/java/org/apache/accumulo/test/functional/GracefulShutdownIT.java
index 0257ff136e,e98a3a1d1b..43fa803ce5
--- 
a/test/src/main/java/org/apache/accumulo/test/functional/GracefulShutdownIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/functional/GracefulShutdownIT.java
@@@ -247,22 -232,14 +247,21 @@@ public class GracefulShutdownIT extend
          control.refreshProcesses(ServerType.COMPACTOR);
          return control.getProcesses(ServerType.COMPACTOR).isEmpty();
        });
-       final long numFiles3 = getNumFilesForTable(ctx, tid);
-       assertTrue(numFiles3 < numFiles2);
-       assertEquals(1, numFiles3);
+       Wait.waitFor(() -> getNumFilesForTable(ctx, tid) < numFiles2);
+       assertEquals(1, getNumFilesForTable(ctx, tid));
  
 -      getCluster().getConfig().setNumScanServers(1);
 -      control.startScanServer(ScanServer.class, 1, GROUP_NAME);
 -      Wait.waitFor(() -> client.instanceOperations().getScanServers().size() 
== 1);
 -      final Set<String> sservers = 
client.instanceOperations().getScanServers();
 -      final HostAndPort sserver = 
HostAndPort.fromString(sservers.iterator().next());
 +      getCluster().getConfig().getClusterServerConfiguration()
 +          .addScanServerResourceGroup(GROUP_NAME, 1);
 +      getCluster().getClusterControl().start(ServerType.SCAN_SERVER);
 +
 +      Wait.waitFor(() -> getCluster()
 +          .getServerContext().getServerPaths().getScanServer(
 +              (rg) -> rg.equals(ResourceGroupId.of(GROUP_NAME)), 
AddressSelector.all(), true)
 +          .size() == 1);
 +      final Set<ServiceLockPath> sservers =
 +          getCluster().getServerContext().getServerPaths().getScanServer(
 +              (rg) -> rg.equals(ResourceGroupId.of(GROUP_NAME)), 
AddressSelector.all(), true);
 +      final HostAndPort sserver = 
HostAndPort.fromString(sservers.iterator().next().getServer());
        try (final Scanner scanner = client.createScanner(tableName, 
Authorizations.EMPTY)) {
          scanner.setRange(new Range());
          scanner.setConsistencyLevel(ConsistencyLevel.EVENTUAL);