Merge branch '2.1' into 3.1

dlmarion · Dec 5, 2024 · a413560 · a413560
2 parents 1224686 + 355b0d7
commit a413560
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/core/src/main/java/org/apache/accumulo/core/util/threads/ThreadPools.java b/core/src/main/java/org/apache/accumulo/core/util/threads/ThreadPools.java
@@ -360,7 +360,7 @@ public ThreadPoolExecutorBuilder getPoolBuilder(@NonNull final ThreadPoolNames p
   }
 
   /**
-   * Fet a fluent-style pool builder.
+   * Get a fluent-style pool builder.
    *
    * @param name the pool name - the name trimed and prepended with the ACCUMULO_POOL_PREFIX so that
    *        pool names begin with a consistent prefix.
@@ -370,7 +370,11 @@ public ThreadPoolExecutorBuilder getPoolBuilder(@NonNull final String name) {
     if (trimmed.startsWith(ACCUMULO_POOL_PREFIX.poolName)) {
       return new ThreadPoolExecutorBuilder(trimmed);
     } else {
-      return new ThreadPoolExecutorBuilder(ACCUMULO_POOL_PREFIX.poolName + trimmed);
+      if (trimmed.startsWith(".")) {
+        return new ThreadPoolExecutorBuilder(ACCUMULO_POOL_PREFIX.poolName + trimmed);
+      } else {
+        return new ThreadPoolExecutorBuilder(ACCUMULO_POOL_PREFIX.poolName + "." + trimmed);
+      }
     }
   }
 

diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
@@ -306,7 +306,7 @@ private static ServerAddress createNonBlockingServer(HostAndPort address, TProce
   private static ThreadPoolExecutor createSelfResizingThreadPool(final String serverName,
       final int executorThreads, long threadTimeOut, final AccumuloConfiguration conf,
       long timeBetweenThreadChecks) {
-    String poolName = ACCUMULO_POOL_PREFIX.poolName + serverName.toLowerCase() + ".client";
+    String poolName = ACCUMULO_POOL_PREFIX.poolName + "." + serverName.toLowerCase() + ".client";
     final ThreadPoolExecutor pool =
         ThreadPools.getServerThreadPools().getPoolBuilder(poolName).numCoreThreads(executorThreads)
             .withTimeOut(threadTimeOut, MILLISECONDS).enableThreadPoolMetrics().build();

diff --git a/...ver/src/main/java/org/apache/accumulo/tserver/compactions/InternalCompactionExecutor.java b/...ver/src/main/java/org/apache/accumulo/tserver/compactions/InternalCompactionExecutor.java
@@ -208,7 +208,7 @@ public SubmittedJob submit(CompactionServiceId csid, CompactionJob job, Compacta
 
   public void setThreads(int numThreads) {
     ThreadPools.resizePool(threadPool, () -> numThreads,
-        ACCUMULO_POOL_PREFIX.poolName + "accumulo.pool.compaction." + ceid);
+        ACCUMULO_POOL_PREFIX.poolName + ".accumulo.pool.compaction." + ceid);
   }
 
   @Override