(accumulo) branch main updated: Renamed wal sort buffer size property (#6362)

[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 13e87253bb Renamed wal sort buffer size property (#6362)
13e87253bb is described below

commit 13e87253bb8377ee18fc3f96559bececdcbe91ba
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Mon May 11 07:37:09 2026 -0400

    Renamed wal sort buffer size property (#6362)
    
    The WAL sorting happens in the Compactor, Scan Server,
    and Tablet Server processes.
---
 core/src/main/java/org/apache/accumulo/core/conf/Property.java      | 6 ++++++
 .../org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java    | 4 ++--
 .../src/main/java/org/apache/accumulo/tserver/log/LogSorter.java    | 4 +++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java 
b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index cdf70a19a3..1b59326c76 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -396,6 +396,10 @@ public enum Property {
       "Interval at which the Manager and TabletServer should verify their 
server locks. A value of zero"
           + " disables this check. The default value changed from 0 to 2m in 
4.0.0.",
       "2.1.4"),
+  GENERAL_SERVER_WAL_SORT_BUFFER_SIZE("general.server.wal.sort.buffer.size", 
"10%",
+      PropertyType.MEMORY, "The amount of memory to use when sorting logs 
during recovery.",
+      "4.0.0"),
+
   // properties that are specific to manager server behavior
   MANAGER_PREFIX("manager.", null, PropertyType.PREFIX,
       "Properties in this category affect the behavior of the manager 
server.", "2.1.0"),
@@ -806,6 +810,8 @@ public enum Property {
       "1.5.0"),
   TSERV_WAL_SORT_MAX_CONCURRENT("tserver.wal.sort.concurrent.max", "2", 
PropertyType.COUNT,
       "The maximum number of threads to use to sort logs during recovery.", 
"2.1.0"),
+  @Deprecated(since = "4.0.0")
+  @ReplacedBy(property = GENERAL_SERVER_WAL_SORT_BUFFER_SIZE)
   TSERV_WAL_SORT_BUFFER_SIZE("tserver.wal.sort.buffer.size", "10%", 
PropertyType.MEMORY,
       "The amount of memory to use when sorting logs during recovery.", 
"2.1.0"),
   TSERV_WAL_SORT_FILE_PREFIX("tserver.wal.sort.file.", null, 
PropertyType.PREFIX,
diff --git 
a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java
 
b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java
index 79a45ede15..5b4b2b521e 100644
--- 
a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java
+++ 
b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java
@@ -77,7 +77,7 @@ public class MiniAccumuloClusterTest extends WithTestNames {
         new MiniAccumuloConfig(tempDir.toFile(), 
ROOT_PASSWORD).setJDWPEnabled(true);
     config.setZooKeeperPort(0);
     HashMap<String,String> site = new HashMap<>();
-    site.put(Property.TSERV_WAL_SORT_BUFFER_SIZE.getKey(), "15%");
+    site.put(Property.GENERAL_SERVER_WAL_SORT_BUFFER_SIZE.getKey(), "15%");
     config.setSiteConfig(site);
     accumulo = new MiniAccumuloCluster(config);
     accumulo.start();
@@ -194,7 +194,7 @@ public class MiniAccumuloClusterTest extends WithTestNames {
     // ensure what user passed in is what comes back
     assertEquals(0, accumulo.getConfig().getZooKeeperPort());
     HashMap<String,String> site = new HashMap<>();
-    site.put(Property.TSERV_WAL_SORT_BUFFER_SIZE.getKey(), "15%");
+    site.put(Property.GENERAL_SERVER_WAL_SORT_BUFFER_SIZE.getKey(), "15%");
     assertEquals(site, accumulo.getConfig().getSiteConfig());
   }
 
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 cce37890dc..f885e2b8a8 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
@@ -180,7 +180,9 @@ public class LogSorter implements MetricsProducer {
         return;
       }
 
-      final long bufferSize = 
sortedLogConf.getAsBytes(Property.TSERV_WAL_SORT_BUFFER_SIZE);
+      @SuppressWarnings("deprecation")
+      final long bufferSize = sortedLogConf.getAsBytes(sortedLogConf.resolve(
+          Property.GENERAL_SERVER_WAL_SORT_BUFFER_SIZE, 
Property.TSERV_WAL_SORT_BUFFER_SIZE));
       Thread.currentThread().setName("Sorting " + name + " for recovery");
       while (true) {
         final ArrayList<Pair<LogFileKey,LogFileValue>> buffer = new 
ArrayList<>();