Merge branch 'main' into elasticity

apache · Jun 24, 2024 · af58350 · af58350
2 parents 89b15be + 53e75d3
commit af58350
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/main/java/org/apache/accumulo/testing/randomwalk/Module.java b/src/main/java/org/apache/accumulo/testing/randomwalk/Module.java
@@ -220,8 +220,8 @@ public void visit(final State state, final RandWalkEnv env, Properties props) th
       fixture.setUp(state, env);
     }
 
-    ExecutorService service =
-        ThreadPools.getServerThreadPools().createFixedThreadPool(1, "RandomWalk Runner", false);
+    ExecutorService service = ThreadPools.getServerThreadPools().getPoolBuilder("RandomWalk Runner")
+        .numCoreThreads(1).build();
 
     try {
       Node initNode = getNode(initNodeId);

diff --git a/src/main/java/org/apache/accumulo/testing/randomwalk/bulk/Setup.java b/src/main/java/org/apache/accumulo/testing/randomwalk/bulk/Setup.java
@@ -61,8 +61,8 @@ public void visit(State state, RandWalkEnv env, Properties props) throws Excepti
     state.set("fs", FileSystem.get(env.getHadoopConfiguration()));
     state.set("bulkImportSuccess", "true");
     BulkPlusOne.counter.set(0L);
-    ThreadPoolExecutor e = ThreadPools.getServerThreadPools().createFixedThreadPool(MAX_POOL_SIZE,
-        "bulkImportPool", false);
+    ThreadPoolExecutor e = ThreadPools.getServerThreadPools().getPoolBuilder("bulkImportPool")
+        .numCoreThreads(MAX_POOL_SIZE).build();
     state.set("pool", e);
   }
 

diff --git a/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Config.java b/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Config.java
@@ -76,9 +76,7 @@ static Setting s(Property property, long min, long max) {
 			s(Property.TSERV_MINTHREADS, 1, 100),
 			s(Property.TSERV_SESSION_MAXIDLE, 100, 5 * 60 * 1000),
 			s(Property.TSERV_WAL_SORT_BUFFER_SIZE, 1024 * 1024, 1024 * 1024 * 1024L),
-			s(Property.TSERV_TABLET_SPLIT_FINDMIDPOINT_MAXOPEN, 5, 100),
 			s(Property.TSERV_WAL_BLOCKSIZE, 1024 * 1024,1024 * 1024 * 1024 * 10L),
-			s(Property.TSERV_WORKQ_THREADS, 1, 10),
 			s(Property.MANAGER_BULK_TIMEOUT, 10, 600),
 			s(Property.MANAGER_FATE_THREADPOOL_SIZE, 1, 100),
 			s(Property.MANAGER_RECOVERY_DELAY, 0, 100),