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

[dlmarion]

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

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

commit c48adeaa23febcdcab98dd0dbbb79dc4f0df60e2
Merge: d0fb7f5fd2 9ac9ddd95c
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Fri Jan 3 19:24:35 2025 +0000

    Merge branch '2.1' into 3.1

 .../src/main/java/org/apache/accumulo/compactor/Compactor.java         | 3 +++
 .../tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java  | 2 ++
 2 files changed, 5 insertions(+)

diff --cc 
server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
index b9cded93fa,83ff5de7ee..3fe294ad62
--- 
a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
+++ 
b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
@@@ -166,9 -174,10 +168,10 @@@ public class Compactor extends Abstract
  
    private final AtomicBoolean compactionRunning = new AtomicBoolean(false);
  
 -  protected Compactor(CompactorServerOpts opts, String[] args) {
 +  protected Compactor(ConfigOpts opts, String[] args) {
      super("compactor", opts, args);
 -    queueName = opts.getQueueName();
 +    queueName = super.getConfiguration().get(Property.COMPACTOR_QUEUE_NAME);
+     ClusterConfigParser.validateGroupNames(Set.of(queueName));
    }
  
    private long getTotalEntriesRead() {
diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
index b7c512c456,b3301f426c..7fcd59dcc9
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
@@@ -276,7 -280,8 +277,8 @@@ public class ScanServer extends Abstrac
  
      delegate = newThriftScanClientHandler(new WriteTracker());
  
 -    this.groupName = Objects.requireNonNull(opts.getGroupName());
 +    this.groupName = getConfiguration().get(Property.SSERV_GROUP_NAME);
+     ClusterConfigParser.validateGroupNames(Set.of(groupName));
  
      ThreadPools.watchCriticalScheduledTask(getContext().getScheduledExecutor()
          .scheduleWithFixedDelay(() -> 
cleanUpReservedFiles(scanServerReservationExpiration),