(accumulo) 01/03: Fixed ScanServerGroupConfigurationIT from error after merge

[dlmarion]

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

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

commit 96fa64fc2aa18d37b882c4c040e658bf90700f1d
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Mon May 20 17:02:26 2024 +0000

    Fixed ScanServerGroupConfigurationIT from error after merge
---
 .../apache/accumulo/test/ScanServerGroupConfigurationIT.java   | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git 
a/test/src/main/java/org/apache/accumulo/test/ScanServerGroupConfigurationIT.java
 
b/test/src/main/java/org/apache/accumulo/test/ScanServerGroupConfigurationIT.java
index 09f1cb921e..89582eeea7 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/ScanServerGroupConfigurationIT.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/ScanServerGroupConfigurationIT.java
@@ -38,7 +38,6 @@ import org.apache.accumulo.harness.SharedMiniClusterBase;
 import org.apache.accumulo.minicluster.ServerType;
 import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl;
 import org.apache.accumulo.test.util.Wait;
-import org.apache.accumulo.tserver.ScanServer;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.zookeeper.ZooKeeper;
 import org.junit.jupiter.api.AfterAll;
@@ -163,11 +162,10 @@ public class ScanServerGroupConfigurationIT extends 
SharedMiniClusterBase {
             ScanServerIT.ingest(client, tableName, 10, 10, 10, "colf", true);
         assertEquals(100, additionalIngest1);
 
-        // Bump the number of scan serves that can run to start the GROUP1 
scan server
-        
getCluster().getConfig().getClusterServerConfiguration().setNumDefaultScanServers(2);
-
-        getCluster()._exec(ScanServer.class, ServerType.SCAN_SERVER, Map.of(),
-            new String[] {"-g", "GROUP1"});
+        // A a scan server for resource group GROUP1
+        getCluster().getConfig().getClusterServerConfiguration()
+            .addScanServerResourceGroup("GROUP1", 1);
+        getCluster().getClusterControl().start(ServerType.SCAN_SERVER);
         Wait.waitFor(() -> zk.getChildren(scanServerRoot, false).size() == 2);
         Wait.waitFor(() -> ((ClientContext) 
client).getScanServers().values().stream().anyMatch(
             (p) -> 
p.getSecond().equals(ScanServerSelector.DEFAULT_SCAN_SERVER_GROUP_NAME))