(accumulo) branch main updated: Fixed LogSorter from changes due to incorrect merge (#5307)

[dlmarion]

This is an automated email from the ASF dual-hosted git repository.

dlmarion pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/main by this push:
     new ed56a8c33b Fixed LogSorter from changes due to incorrect merge (#5307)
ed56a8c33b is described below

commit ed56a8c33b73fe9bfbd061ee847bb92712fdd676
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Wed Feb 5 11:43:45 2025 -0500

    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.
---
 .../tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java | 2 +-
 .../src/main/java/org/apache/accumulo/tserver/TabletServer.java       | 2 +-
 .../src/main/java/org/apache/accumulo/tserver/log/LogSorter.java      | 4 ++--
 3 files changed, 4 insertions(+), 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
index b590b1b191..59949675ac 100644
--- 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 class ScanServer extends AbstractServer
       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
index a0911a451a..162990af66 100644
--- 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 class TabletServer extends AbstractServer implements 
TabletHostingServer
       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
index 74fa6680be..d6356775bf 100644
--- 
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 class LogSorter {
    * 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();