(accumulo) 01/01: 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 7f12cc2f7025081275bbffe7213fa51e50fa95ef
Merge: f1dc4dc05c 84de006a14
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Mon Aug 12 17:24:48 2024 +0000

    Merge branch '2.1'

 .../org/apache/accumulo/server/conf/CheckCompactionConfig.java   | 9 ++++++++-
 .../org/apache/accumulo/manager/upgrade/UpgradeCoordinator.java  | 6 ++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --cc 
server/base/src/main/java/org/apache/accumulo/server/conf/CheckCompactionConfig.java
index 65ffd01643,c02b36edf7..97d46866b4
--- 
a/server/base/src/main/java/org/apache/accumulo/server/conf/CheckCompactionConfig.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/conf/CheckCompactionConfig.java
@@@ -94,7 -94,12 +94,12 @@@ public class CheckCompactionConfig impl
      }
  
      AccumuloConfiguration config = 
SiteConfiguration.fromFile(path.toFile()).build();
+     validate(config);
+   }
+ 
+   public static void validate(AccumuloConfiguration config)
+       throws ReflectiveOperationException, SecurityException, 
IllegalArgumentException {
 -    var servicesConfig = new CompactionServicesConfig(config, log::warn);
 +    var servicesConfig = new CompactionServicesConfig(config);
      ServiceEnvironment senv = createServiceEnvironment(config);
  
      Set<String> defaultServices = Set.of(DEFAULT, META, ROOT);