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

[krathbun]

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

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

commit b59d97c842a55bb9510328f3d1d5086b4a163dd4
Merge: 0674b5eb27 5792fed3d1
Author: Kevin Rathbun <kevinrr...@gmail.com>
AuthorDate: Fri May 2 10:10:09 2025 -0400

    Merge branch '2.1'

 .../org/apache/accumulo/test/ZombieScanIT.java     | 29 +++++++++++-----------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --cc test/src/main/java/org/apache/accumulo/test/ZombieScanIT.java
index 210cd67373,73e6496463..8681aee9fd
--- a/test/src/main/java/org/apache/accumulo/test/ZombieScanIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ZombieScanIT.java
@@@ -201,22 -195,21 +201,22 @@@ public class ZombieScanIT extends Confi
        }
  
        // should eventually see the four zombie scans running against four 
tablets
-       Wait.waitFor(() -> countDistinctTabletsScans(table, c) == 4);
+       Wait.waitFor(() -> countDistinctTabletsScans(table, c) == 4, 60_000);
  
 -      assertEquals(1, c.instanceOperations().getTabletServers().size());
 +      assertEquals(1, 
c.instanceOperations().getServers(ServerId.Type.TABLET_SERVER).size());
  
        // Start 3 new tablet servers, this should cause the table to balance 
and the tablets with
        // zombie scans to unload. The Zombie scans should not prevent the 
table from unloading. The
        // scan threads will still be running on the old tablet servers.
 -      getCluster().getConfig().setNumTservers(4);
 -      
getCluster().getClusterControl().startAllServers(ServerType.TABLET_SERVER);
 +      
getCluster().getConfig().getClusterServerConfiguration().setNumDefaultTabletServers(4);
 +      getCluster().getClusterControl().start(ServerType.TABLET_SERVER, 
Map.of(), 4);
  
        // Wait for all tablets servers
-       Wait.waitFor(
-           () -> 
c.instanceOperations().getServers(ServerId.Type.TABLET_SERVER).size() == 4);
 -      Wait.waitFor(() -> c.instanceOperations().getTabletServers().size() == 
4, 60_000);
++      Wait.waitFor(() -> 
c.instanceOperations().getServers(ServerId.Type.TABLET_SERVER).size() == 4,
++          60_000);
  
        // The table should eventually balance across the 4 tablet servers
-       Wait.waitFor(() -> countLocations(table, c) == 4);
+       Wait.waitFor(() -> countLocations(table, c) == 4, 60_000);
  
        // The zombie scans should still be running
        assertTrue(futures.stream().noneMatch(Future::isDone));
@@@ -275,9 -264,11 +275,10 @@@
      try (AccumuloClient c = 
Accumulo.newClient().from(getClientProperties()).build()) {
  
        if (serverType == SCAN_SERVER) {
 -        getCluster().getConfig().setNumScanServers(1);
 -        getCluster().getClusterControl().startAllServers(SCAN_SERVER);
          // Scans will fall back to tablet servers when no scan servers are 
present. So wait for scan
          // servers to show up in zookeeper. Can remove this in 3.1.
-         Wait.waitFor(() -> 
!c.instanceOperations().getServers(ServerId.Type.SCAN_SERVER).isEmpty());
 -        Wait.waitFor(() -> 
!c.instanceOperations().getScanServers().isEmpty(), 60_000);
++        Wait.waitFor(() -> 
!c.instanceOperations().getServers(ServerId.Type.SCAN_SERVER).isEmpty(),
++            60_000);
        }
  
        c.tableOperations().create(table);