Fixed LogSorter from changes due to incorrect merge (#5307)

The merge of #5193 from 2.1 to main reverted some changes in main to LogSorter causing RecoveryIT to fail.
apache · Feb 5, 2025 · ed56a8c · ed56a8c
1 parent 56b97fa
commit ed56a8c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
@@ -394,7 +394,7 @@ public void run() {
       try {
         // Attempt to process all existing log sorting work and start a background
         // thread to look for log sorting work in the future
-        logSorter.startWatchingForRecoveryLogs();
+        logSorter.startWatchingForRecoveryLogs(threadPoolSize);
       } catch (Exception ex) {
         LOG.error("Error starting LogSorter");
         throw new RuntimeException(ex);

diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -586,7 +586,7 @@ public void run() {
       try {
         // Attempt to process all existing log sorting work and start a background
         // thread to look for log sorting work in the future
-        logSorter.startWatchingForRecoveryLogs();
+        logSorter.startWatchingForRecoveryLogs(threadPoolSize);
       } catch (Exception ex) {
         log.error("Error starting LogSorter");
         throw new RuntimeException(ex);

diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java
@@ -313,8 +313,8 @@ public long sortLogsIfNeeded() throws KeeperException, InterruptedException {
    * thread to look for log sorting work in the future that will be processed by the
    * ThreadPoolExecutor
    */
-  public void startWatchingForRecoveryLogs() throws KeeperException, InterruptedException {
-    int threadPoolSize = this.conf.getCount(Property.TSERV_WAL_SORT_MAX_CONCURRENT);
+  public void startWatchingForRecoveryLogs(int threadPoolSize)
+      throws KeeperException, InterruptedException {
     ThreadPoolExecutor threadPool =
         ThreadPools.getServerThreadPools().getPoolBuilder(TSERVER_WAL_SORT_CONCURRENT_POOL)
             .numCoreThreads(threadPoolSize).enableThreadPoolMetrics().build();