From 7b8b21335ecd6adc168e9fb99aae58cbff2b75dd Mon Sep 17 00:00:00 2001
From: Kevin Rathbun <krathbun@apache.org>
Date: Mon, 16 Dec 2024 10:37:57 -0500
Subject: [PATCH 1/2] Adds new accumulo command (#5073)

* Adds new accumulo command:

Adds new `accumulo check-accumulo-properties` command which checks the provided Accumulo configuration file for errors. Only checks the file contents, and not any running instance, so useful for verifying config prior to init. Performs a subset of the checks that `accumulo check-server-config` does. Useful for (at least mostly) validating the `accumulo.properties` file without a running instance.

Co-authored-by: Christopher Tubbs <ctubbsii@apache.org>
---
 .../server/conf/CheckAccumuloProperties.java  | 66 +++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 server/base/src/main/java/org/apache/accumulo/server/conf/CheckAccumuloProperties.java

diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/CheckAccumuloProperties.java b/server/base/src/main/java/org/apache/accumulo/server/conf/CheckAccumuloProperties.java
new file mode 100644
index 00000000000..e7c7394fece
--- /dev/null
+++ b/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);
+  }
+}

From 79d972f83b345adbf4cd4b65470d53b8b4f13f98 Mon Sep 17 00:00:00 2001
From: Kevin Rathbun <krathbun@apache.org>
Date: Mon, 16 Dec 2024 10:39:50 -0500
Subject: [PATCH 2/2] Fix Fate pool watcher bug (#5171)

Was incorrectly calculating the number of TransactionRunners to execute
---
 core/src/main/java/org/apache/accumulo/core/fate/Fate.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/org/apache/accumulo/core/fate/Fate.java b/core/src/main/java/org/apache/accumulo/core/fate/Fate.java
index 280922a332b..8287edbb334 100644
--- a/core/src/main/java/org/apache/accumulo/core/fate/Fate.java
+++ b/core/src/main/java/org/apache/accumulo/core/fate/Fate.java
@@ -250,7 +250,7 @@ public void startTransactionRunners(AccumuloConfiguration conf) {
       // resize the pool if the property changed
       ThreadPools.resizePool(pool, conf, Property.MANAGER_FATE_THREADPOOL_SIZE);
       // If the pool grew, then ensure that there is a TransactionRunner for each thread
-      int needed = conf.getCount(Property.MANAGER_FATE_THREADPOOL_SIZE) - pool.getQueue().size();
+      int needed = conf.getCount(Property.MANAGER_FATE_THREADPOOL_SIZE) - pool.getActiveCount();
       if (needed > 0) {
         for (int i = 0; i < needed; i++) {
           try {