This is an automated email from the ASF dual-hosted git repository.
ddanielr pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 981747433306236511fb652c4b7ebe5a461046ae
Merge: aed3919e46 48f150045b
Author: Daniel Roberts <ddani...@gmail.com>
AuthorDate: Fri Mar 1 00:51:19 2024 +0000
Merge branch '2.1'
.../main/java/org/apache/accumulo/core/Constants.java | 1 +
.../java/org/apache/accumulo/core/conf/Property.java | 18 ++++++++++++------
.../spi/compaction/SimpleCompactionDispatcher.java | 10 +++++++---
.../accumulo/server/conf/CheckCompactionConfig.java | 4 +++-
.../test/compaction/BadCompactionServiceConfigIT.java | 4 +++-
5 files changed, 26 insertions(+), 11 deletions(-)
diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 6cb1207f40,1db7d9326d..e2afb7defb
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@@ -637,25 -685,23 +639,29 @@@ public enum Property
PropertyType.JSON,
"See {% jlink -f
org.apache.accumulo.core.spi.compaction.DefaultCompactionPlanner %}.",
"2.1.0"),
+ @Deprecated(since = "3.1")
-
TSERV_COMPACTION_SERVICE_DEFAULT_PLANNER("tserver.compaction.major.service.default.planner",
+ TSERV_COMPACTION_SERVICE_DEFAULT_PLANNER(
+ "tserver.compaction.major.service." + DEFAULT_COMPACTION_SERVICE_NAME +
".planner",
DefaultCompactionPlanner.class.getName(), PropertyType.CLASSNAME,
"Planner for default compaction service.", "2.1.0"),
+ @Deprecated(since = "3.1")
-
TSERV_COMPACTION_SERVICE_DEFAULT_RATE_LIMIT("tserver.compaction.major.service.default.rate.limit",
- "0B", PropertyType.BYTES,
+ TSERV_COMPACTION_SERVICE_DEFAULT_RATE_LIMIT(
+ "tserver.compaction.major.service." + DEFAULT_COMPACTION_SERVICE_NAME +
".rate.limit", "0B",
+ PropertyType.BYTES,
"Maximum number of bytes to read or write per second over all major"
- + " compactions in this compaction service, or 0B for unlimited.",
+ + " compactions in this compaction service, or 0B for unlimited.
This property has"
+ + " been deprecated in anticipation of it being removed in a future
release that"
+ + " removes the rate limiting feature.",
"2.1.0"),
+ @Deprecated(since = "3.1")
TSERV_COMPACTION_SERVICE_DEFAULT_MAX_OPEN(
- "tserver.compaction.major.service.default.planner.opts.maxOpen", "10",
PropertyType.COUNT,
- "The maximum number of files a compaction will open.", "2.1.0"),
+ "tserver.compaction.major.service." + DEFAULT_COMPACTION_SERVICE_NAME
+ + ".planner.opts.maxOpen",
+ "10", PropertyType.COUNT, "The maximum number of files a compaction
will open.", "2.1.0"),
+ @Deprecated(since = "3.1")
TSERV_COMPACTION_SERVICE_DEFAULT_EXECUTORS(
- "tserver.compaction.major.service.default.planner.opts.executors",
+ "tserver.compaction.major.service." + DEFAULT_COMPACTION_SERVICE_NAME
+ + ".planner.opts.executors",
"[{'name':'small','type':'internal','maxSize':'32M','numThreads':2},{'name':'medium','type':'internal','maxSize':'128M','numThreads':2},{'name':'large','type':'internal','numThreads':2}]"
.replaceAll("'", "\""),
PropertyType.STRING,
