Merge remote-tracking branch 'upstream/3.1'

core/src/main/java/org/apache/accumulo/core/fate/Fate.java

@@ -356,7 +356,7 @@ public Fate(T environment, FateStore<T> store, boolean runDeadResCleaner,
       ThreadPools.resizePool(pool, conf, Property.MANAGER_FATE_THREADPOOL_SIZE);
       // If the pool grew, then ensure that there is a TransactionRunner for each thread
       final int configured = conf.getCount(Property.MANAGER_FATE_THREADPOOL_SIZE);
-      final int needed = configured - pool.getQueue().size();
+      final int needed = configured - pool.getActiveCount();
       if (needed > 0) {
         for (int i = 0; i < needed; i++) {
           try {

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

@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.accumulo.server.conf;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.accumulo.core.conf.SiteConfiguration;
+import org.apache.accumulo.server.ServerDirs;
+import org.apache.accumulo.server.fs.VolumeManagerImpl;
+import org.apache.accumulo.start.spi.KeywordExecutable;
+import org.apache.hadoop.conf.Configuration;
+
+import com.google.auto.service.AutoService;
+import com.google.common.base.Preconditions;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+@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";
+  }
+
+  @Override
+  public String description() {
+    return "Checks the provided Accumulo configuration file for errors. "
+        + "This only checks the contents of the file and not any running Accumulo system, "
+        + "so it can be used prior to init, but only performs a subset of the checks done by "
+        + (new CheckServerConfig().keyword());
+  }
+
+  @Override
+  public void execute(String[] args) throws Exception {
+    main(args);
+  }
+}