This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 9bac4964c66a9e7328c5f9bfe17b805e2176f3c7
Merge: 0da43b39f7 c2c8cfc23c
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Wed Nov 15 17:23:54 2023 -0500
Merge branch 'main' into elasticity
core/pom.xml | 4 ++
.../org/apache/accumulo/core/conf/Property.java | 4 +-
.../apache/accumulo/core/conf/PropertyType.java | 50 ++++++++++++++-
.../accumulo/core/metadata/schema/Ample.java | 2 +-
.../core/metadata/schema/TabletsMetadata.java | 13 ++++
.../apache/accumulo/core/conf/PropertyTest.java | 32 ++++++++++
.../accumulo/core/conf/PropertyTypeTest.java | 11 +++-
.../test/functional/GarbageCollectorIT.java | 4 +-
.../apache/accumulo/test/shell/ConfigSetIT.java | 72 ++++++++++++++++++++++
.../org/apache/accumulo/test/shell/ShellIT.java | 2 +-
10 files changed, 184 insertions(+), 10 deletions(-)
diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java
index af0d92cadc,6c1296fa17..a305a6846f
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@@ -606,8 -603,9 +606,8 @@@ public enum Property
"The maximum number of files a compaction will open.", "2.1.0"),
TSERV_COMPACTION_SERVICE_META_EXECUTORS(
"tserver.compaction.major.service.meta.planner.opts.executors",
-
"[{'name':'small','type':'internal','maxSize':'32M','numThreads':2},{'name':'huge','type':'internal','numThreads':2}]"
- .replaceAll("'", "\""),
+
"[{'name':'all','type':'external','group':'accumulo_meta'}]".replaceAll("'",
"\""),
- PropertyType.STRING,
+ PropertyType.JSON,
"See {% jlink -f
org.apache.accumulo.core.spi.compaction.DefaultCompactionPlanner %}.",
"2.1.0"),
TSERV_COMPACTION_SERVICE_DEFAULT_PLANNER("tserver.compaction.major.service.default.planner",
