This is an automated email from the ASF dual-hosted git repository.
ddanielr pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 9b62f27b820439c4989a681c9d131d40213d58ca
Merge: 54b7965e60 764f55e0c8
Author: Daniel Roberts <ddani...@gmail.com>
AuthorDate: Mon Nov 27 22:30:12 2023 +0000
Merge branch 'main' into elasticity
.../core/client/admin/InstanceOperations.java | 12 +++----
.../accumulo/core/rpc/clients/TServerClient.java | 22 +++++++++---
.../core/spi/compaction/CompactionPlanner.java | 12 +++----
.../spi/compaction/DefaultCompactionPlanner.java | 28 +++++++--------
.../server/conf/CheckCompactionConfigTest.java | 42 +++++++++++-----------
.../compaction/ExternalCompactionTestUtils.java | 32 ++++++++---------
6 files changed, 79 insertions(+), 69 deletions(-)
diff --cc
server/base/src/test/java/org/apache/accumulo/server/conf/CheckCompactionConfigTest.java
index 911743f2dc,ec903814df..a8b871eb4d
---
a/server/base/src/test/java/org/apache/accumulo/server/conf/CheckCompactionConfigTest.java
+++
b/server/base/src/test/java/org/apache/accumulo/server/conf/CheckCompactionConfigTest.java
@@@ -67,12 -67,12 +67,12 @@@ public class CheckCompactionConfigTest
+
"[{'name':'small','type':'internal','maxSize':'16M','numThreads':8},\\\n"
+
"{'name':'medium','type':'internal','maxSize':'128M','numThreads':4},\\\n"
+ "{'name':'large','type':'internal','numThreads':2}] \n"
- + "tserver.compaction.major.service.cs2.planner="
+ + "compaction.service.cs2.planner="
+ "org.apache.accumulo.core.spi.compaction.DefaultCompactionPlanner
\n"
- + "tserver.compaction.major.service.cs2.planner.opts.executors=\\\n"
+ + "compaction.service.cs2.planner.opts.executors=\\\n"
+
"[{'name':'small','type':'internal','maxSize':'16M','numThreads':7},\\\n"
+
"{'name':'medium','type':'internal','maxSize':'128M','numThreads':5},\\\n"
- +
"{'name':'large','type':'external','queue':'DCQ1'}]").replaceAll("'", "\"");
+ +
"{'name':'large','type':'external','group':'DCQ1'}]").replaceAll("'", "\"");
String filePath = writeToFileAndReturnPath(inputString);
@@@ -87,12 -87,12 +87,12 @@@
+
"[{'name':'small','type':'internal','maxSize':'16M','numThreads':8},\\\n"
+
"{'name':'medium','type':'internal','maxSize':'128M','numThreads':4},\\\n"
+ "{'name':'large','type':'internal','numThreads':2}] \n"
- + "tserver.compaction.major.service.cs2.planner="
+ + "compaction.service.cs2.planner="
+ "org.apache.accumulo.core.spi.compaction.DefaultCompactionPlanner
\n"
- + "tserver.compaction.major.service.cs2.planner.opts.executors=\\\n"
+ + "compaction.service.cs2.planner.opts.executors=\\\n"
+
"[{'name':'small','type':'internal','maxSize':'16M','numThreads':7},\\\n"
+
"{'name':'medium','type':'internal','maxSize':'128M','numThreads':5},\\\n"
- + "{'name':'large','type':'external','queue':'DCQ1'}] \n"
+ + "{'name':'large','type':'external','group':'DCQ1'}] \n"
+ "compaction.service.cs3.planner="
+ "org.apache.accumulo.core.spi.compaction.DefaultCompactionPlanner
\n"
+ "compaction.service.cs3.planner.opts.queues=\\\n"
@@@ -104,11 -104,11 +104,11 @@@
@Test
public void testThrowsExternalNumThreadsError() throws IOException {
- String inputString = ("tserver.compaction.major.service.cs1.planner="
+ String inputString = ("compaction.service.cs1.planner="
+ "org.apache.accumulo.core.spi.compaction.DefaultCompactionPlanner
\n"
- + "tserver.compaction.major.service.cs1.planner.opts.executors=\\\n"
+ + "compaction.service.cs1.planner.opts.executors=\\\n"
+
"[{'name':'small','type':'internal','maxSize':'16M','numThreads':8},\\\n"
- +
"{'name':'medium','type':'external','maxSize':'128M','numThreads':4},\\\n"
+ + "{'name':'medium','type':'external','maxSize':'128M',
'group':'DCQ1', 'numThreads':4},\\\n"
+
"{'name':'large','type':'internal','numThreads':2}]").replaceAll("'", "\"");
String expectedErrorMsg = "'numThreads' should not be specified for
external compactions";
diff --cc
test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionTestUtils.java
index dfbe5736ab,de242583fc..6fa0fce8cd
---
a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionTestUtils.java
+++
b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionTestUtils.java
@@@ -194,39 -197,38 +194,39 @@@ public class ExternalCompactionTestUtil
clProps.put(ClientProperty.BATCH_WRITER_LATENCY_MAX.getKey(), "2s");
cfg.setClientProps(clProps);
+ // configure the compaction services to use the queues
- cfg.setProperty("tserver.compaction.major.service.cs1.planner",
+ cfg.setProperty(Property.COMPACTION_SERVICE_PREFIX.getKey() +
"cs1.planner",
DefaultCompactionPlanner.class.getName());
-
cfg.setProperty("tserver.compaction.major.service.cs1.planner.opts.executors",
+ cfg.setProperty(Property.COMPACTION_SERVICE_PREFIX.getKey() +
"cs1.planner.opts.executors",
- "[{'name':'all', 'type': 'external', 'queue': '" + QUEUE1 + "'}]");
+ "[{'name':'all', 'type': 'external', 'group': '" + GROUP1 + "'}]");
- cfg.setProperty("tserver.compaction.major.service.cs2.planner",
+ cfg.setProperty(Property.COMPACTION_SERVICE_PREFIX.getKey() +
"cs2.planner",
DefaultCompactionPlanner.class.getName());
-
cfg.setProperty("tserver.compaction.major.service.cs2.planner.opts.executors",
+ cfg.setProperty(Property.COMPACTION_SERVICE_PREFIX.getKey() +
"cs2.planner.opts.executors",
- "[{'name':'all', 'type': 'external','queue': '" + QUEUE2 + "'}]");
+ "[{'name':'all', 'type': 'external','group': '" + GROUP2 + "'}]");
- cfg.setProperty("tserver.compaction.major.service.cs3.planner",
+ cfg.setProperty(Property.COMPACTION_SERVICE_PREFIX.getKey() +
"cs3.planner",
DefaultCompactionPlanner.class.getName());
-
cfg.setProperty("tserver.compaction.major.service.cs3.planner.opts.executors",
+ cfg.setProperty(Property.COMPACTION_SERVICE_PREFIX.getKey() +
"cs3.planner.opts.executors",
- "[{'name':'all', 'type': 'external','queue': '" + QUEUE3 + "'}]");
+ "[{'name':'all', 'type': 'external','group': '" + GROUP3 + "'}]");
- cfg.setProperty("tserver.compaction.major.service.cs4.planner",
+ cfg.setProperty(Property.COMPACTION_SERVICE_PREFIX.getKey() +
"cs4.planner",
DefaultCompactionPlanner.class.getName());
-
cfg.setProperty("tserver.compaction.major.service.cs4.planner.opts.executors",
+ cfg.setProperty(Property.COMPACTION_SERVICE_PREFIX.getKey() +
"cs4.planner.opts.executors",
- "[{'name':'all', 'type': 'external','queue': '" + QUEUE4 + "'}]");
+ "[{'name':'all', 'type': 'external','group': '" + GROUP4 + "'}]");
- cfg.setProperty("tserver.compaction.major.service.cs5.planner",
+ cfg.setProperty(Property.COMPACTION_SERVICE_PREFIX.getKey() +
"cs5.planner",
DefaultCompactionPlanner.class.getName());
-
cfg.setProperty("tserver.compaction.major.service.cs5.planner.opts.executors",
+ cfg.setProperty(Property.COMPACTION_SERVICE_PREFIX.getKey() +
"cs5.planner.opts.executors",
- "[{'name':'all', 'type': 'external','queue': '" + QUEUE5 + "'}]");
+ "[{'name':'all', 'type': 'external','group': '" + GROUP5 + "'}]");
- cfg.setProperty("tserver.compaction.major.service.cs6.planner",
+ cfg.setProperty(Property.COMPACTION_SERVICE_PREFIX.getKey() +
"cs6.planner",
DefaultCompactionPlanner.class.getName());
-
cfg.setProperty("tserver.compaction.major.service.cs6.planner.opts.executors",
+ cfg.setProperty(Property.COMPACTION_SERVICE_PREFIX.getKey() +
"cs6.planner.opts.executors",
- "[{'name':'all', 'type': 'external','queue': '" + QUEUE6 + "'}]");
+ "[{'name':'all', 'type': 'external','group': '" + GROUP6 + "'}]");
- cfg.setProperty("tserver.compaction.major.service.cs7.planner",
+ cfg.setProperty(Property.COMPACTION_SERVICE_PREFIX.getKey() +
"cs7.planner",
DefaultCompactionPlanner.class.getName());
-
cfg.setProperty("tserver.compaction.major.service.cs7.planner.opts.executors",
+ cfg.setProperty(Property.COMPACTION_SERVICE_PREFIX.getKey() +
"cs7.planner.opts.executors",
- "[{'name':'all', 'type': 'external','queue': '" + QUEUE7 + "'}]");
+ "[{'name':'all', 'type': 'external','group': '" + GROUP7 + "'}]");
- cfg.setProperty("tserver.compaction.major.service.cs8.planner",
+ cfg.setProperty(Property.COMPACTION_SERVICE_PREFIX.getKey() +
"cs8.planner",
DefaultCompactionPlanner.class.getName());
-
cfg.setProperty("tserver.compaction.major.service.cs8.planner.opts.executors",
+ cfg.setProperty(Property.COMPACTION_SERVICE_PREFIX.getKey() +
"cs8.planner.opts.executors",
- "[{'name':'all', 'type': 'external','queue': '" + QUEUE8 + "'}]");
+ "[{'name':'all', 'type': 'external','group': '" + GROUP8 + "'}]");
cfg.setProperty(Property.COMPACTION_COORDINATOR_FINALIZER_COMPLETION_CHECK_INTERVAL,
"5s");
cfg.setProperty(Property.COMPACTION_COORDINATOR_DEAD_COMPACTOR_CHECK_INTERVAL,
"5s");
cfg.setProperty(Property.COMPACTION_COORDINATOR_TSERVER_COMPACTION_CHECK_INTERVAL,
"3s");
