You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by dl...@apache.org on 2025/01/03 19:24:47 UTC

(accumulo) branch 3.1 updated (d0fb7f5fd2 -> c48adeaa23)

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

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


    from d0fb7f5fd2 Merge branch '2.1' into 3.1
     add 9ac9ddd95c Validate group names passed in server arguments (#5222)
     new c48adeaa23 Merge branch '2.1' into 3.1

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../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(+)

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

Posted by dl...@apache.org.
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 <dl...@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),