(accumulo) 03/04: Merge commit 'e30bfb1b0575d75c0384151599cd383ebbe6b6c8'

[ct...@apache.org]

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

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

commit 84d2cb6228470dc43f8eac3c440cd64300037efd
Merge: 1248dda17b e30bfb1b05
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Wed Jun 11 15:12:10 2025 -0400

    Merge commit 'e30bfb1b0575d75c0384151599cd383ebbe6b6c8'
    
    Merge #5628 from 2.1 to main, resolving Property.java conflicts

 core/src/main/java/org/apache/accumulo/core/conf/Property.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 6b0ea4ae4f,5a938c1a3f..f03c1a341b
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@@ -388,26 -368,22 +388,26 @@@ public enum Property 
        PropertyType.COUNT,
        "Maximum number of threads the TabletGroupWatcher will use in its BatchScanner to"
            + " look for tablets that need maintenance.",
-       "4.0.0"),
+       "2.1.4"),
 -  MANAGER_BULK_RETRIES("manager.bulk.retries", "3", PropertyType.COUNT,
 -      "The number of attempts to bulk import a RFile before giving up.", "1.4.0"),
 -  MANAGER_BULK_THREADPOOL_SIZE("manager.bulk.threadpool.size", "5", PropertyType.COUNT,
 -      "The number of threads to use when coordinating a bulk import.", "1.4.0"),
 -  MANAGER_BULK_THREADPOOL_TIMEOUT("manager.bulk.threadpool.timeout", "0s",
 +  MANAGER_TABLET_REFRESH_MINTHREADS("manager.tablet.refresh.threads.mininum", "10",
 +      PropertyType.COUNT,
 +      "The Manager will notify TabletServers that a Tablet needs to be refreshed after certain operations"
 +          + " are performed (e.g. Bulk Import). This property specifies the number of core threads in a"
 +          + " ThreadPool in the Manager that will be used to request these refresh operations.",
 +      "4.0.0"),
 +  MANAGER_TABLET_REFRESH_MAXTHREADS("manager.tablet.refresh.threads.maximum", "10",
 +      PropertyType.COUNT,
 +      "The Manager will notify TabletServers that a Tablet needs to be refreshed after certain operations"
 +          + " are performed (e.g. Bulk Import). This property specifies the maximum number of threads in a"
 +          + " ThreadPool in the Manager that will be used to request these refresh operations.",
 +      "4.0.0"),
 +  MANAGER_TABLET_MERGEABILITY_INTERVAL("manager.tablet.mergeability.interval", "24h",
        PropertyType.TIMEDURATION,
 -      "The time after which bulk import threads terminate with no work available.  Zero (0) will keep the threads alive indefinitely.",
 -      "2.1.0"),
 +      "Time to wait between scanning tables to identify ranges of tablets that can be "
 +          + " auto-merged. Valid ranges will be have merge fate ops submitted.",
 +      "4.0.0"),
    MANAGER_BULK_TIMEOUT("manager.bulk.timeout", "5m", PropertyType.TIMEDURATION,
        "The time to wait for a tablet server to process a bulk import request.", "1.4.3"),
 -  MANAGER_BULK_MAX_CONNECTIONS("manager.bulk.connections.max", "8", PropertyType.COUNT,
 -      "The maximum number of connections the manager can make to a single tablet server for bulkv2 "
 -          + "load request.  For the case where a single tablet server has a lot of tablets for a bulk import "
 -          + "increasing this may help lower the time it takes to load those tablets.",
 -      "2.1.4"),
    MANAGER_RENAME_THREADS("manager.rename.threadpool.size", "20", PropertyType.COUNT,
        "The number of threads to use when renaming user files during table import or bulk ingest.",
        "2.1.0"),