Merge branch '2.1' into 3.1

Author: ctubbsii

server/base/src/main/java/org/apache/accumulo/server/conf/CheckAccumuloProperties.java

@@ -35,17 +35,6 @@
 @AutoService(KeywordExecutable.class)
 public class CheckAccumuloProperties implements KeywordExecutable {
 
-  @SuppressFBWarnings(value = "PATH_TRAVERSAL_IN", justification = "intentional user-provided path")
-  public static void main(String[] args) throws IOException {
-    Preconditions.checkArgument(args.length == 1,
-        "Expected 1 argument (the properties file path), got " + args.length);
-    var hadoopConfig = new Configuration();
-    var siteConfig = SiteConfiguration.fromFile(new File(args[0])).build();
-
-    VolumeManagerImpl.get(siteConfig, hadoopConfig);
-    new ServerDirs(siteConfig, hadoopConfig);
-  }
-
   @Override
   public String keyword() {
     return "check-accumulo-properties";
@@ -59,8 +48,16 @@ public String description() {
         + (new CheckServerConfig().keyword());
   }
 
+  @SuppressFBWarnings(value = "PATH_TRAVERSAL_IN", justification = "intentional user-provided path")
   @Override
-  public void execute(String[] args) throws Exception {
-    main(args);
+  public void execute(String[] args) throws IOException {
+    Preconditions.checkArgument(args.length == 1,
+        "Expected 1 argument (the properties file path), got " + args.length);
+    var hadoopConfig = new Configuration();
+    var siteConfig = SiteConfiguration.fromFile(new File(args[0])).build();
+
+    VolumeManagerImpl.get(siteConfig, hadoopConfig);
+    new ServerDirs(siteConfig, hadoopConfig);
   }
+
 }

test/src/main/java/org/apache/accumulo/test/start/KeywordStartIT.java

@@ -52,6 +52,7 @@
 import org.apache.accumulo.miniclusterImpl.MiniClusterExecutable;
 import org.apache.accumulo.monitor.Monitor;
 import org.apache.accumulo.monitor.MonitorExecutable;
+import org.apache.accumulo.server.conf.CheckAccumuloProperties;
 import org.apache.accumulo.server.conf.CheckCompactionConfig;
 import org.apache.accumulo.server.conf.CheckServerConfig;
 import org.apache.accumulo.server.conf.util.ZooInfoViewer;
@@ -129,6 +130,7 @@ public void testExpectedClasses() {
     expectSet.put("admin", Admin.class);
     expectSet.put("check-compaction-config", CheckCompactionConfig.class);
     expectSet.put("check-server-config", CheckServerConfig.class);
+    expectSet.put("check-accumulo-properties", CheckAccumuloProperties.class);
     expectSet.put("compaction-coordinator", CoordinatorExecutable.class);
     expectSet.put("compactor", CompactorExecutable.class);
     expectSet.put("create-empty", CreateEmpty.class);