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-testing.git
The following commit(s) were added to refs/heads/main by this push:
new 725b723 Fixes property deprecation build errors
new 6611044 Merge pull request #269 from
ddanielr/fix-property-deprecations
725b723 is described below
commit 725b723cb2c1e9310fc67298526a47d30a743a80
Author: Daniel Roberts <ddani...@gmail.com>
AuthorDate: Tue Jan 2 17:42:55 2024 +0000
Fixes property deprecation build errors
---
conf/accumulo-testing.properties | 4 ++--
.../accumulo/testing/randomwalk/concurrent/Config.java | 13 +++++++++++--
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/conf/accumulo-testing.properties b/conf/accumulo-testing.properties
index 85b3349..b2cbb5e 100644
--- a/conf/accumulo-testing.properties
+++ b/conf/accumulo-testing.properties
@@ -45,8 +45,8 @@ test.ci.common.accumulo.num.tablets=20
test.ci.common.auths=
# Accumulo tserver properties to set when creating a table
test.ci.common.accumulo.server.props=\
-tserver.compaction.major.service.cs1.planner=org.apache.accumulo.core.spi.compaction.DefaultCompactionPlanner
\
-tserver.compaction.major.service.cs1.planner.opts.executors=\
+compaction.service.cs1.planner=org.apache.accumulo.core.spi.compaction.DefaultCompactionPlanner
\
+compaction.service.cs1.planner.opts.executors=\
[{"name":"small","type":"internal","maxSize":"16M","numThreads":8},\
{"name":"medium","type":"internal","maxSize":"128M","numThreads":4},\
{"name":"large","type":"internal","numThreads":2}]
diff --git
a/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Config.java
b/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Config.java
index b6e3a2f..ccd3d81 100644
---
a/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Config.java
+++
b/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Config.java
@@ -56,15 +56,24 @@ public class Config extends Test {
final Property TSERV_READ_AHEAD_MAXCONCURRENT_deprecated =
Property.TSERV_SCAN_EXECUTORS_DEFAULT_THREADS;
+
+ @SuppressWarnings("deprecation")
+ final Property TSERV_COMPACTION_SERVICE_DEFAULT_MAX_OPEN_deprecated =
+ Property.TSERV_COMPACTION_SERVICE_DEFAULT_MAX_OPEN;
+
+ @SuppressWarnings("deprecation")
+ final Property TSERV_COMPACTION_SERVICE_DEFAULT_EXECUTORS_deprecated =
+ Property.TSERV_COMPACTION_SERVICE_DEFAULT_EXECUTORS;
+
// @formatter:off
final Setting[] settings = {
s(Property.TSERV_BLOOM_LOAD_MAXCONCURRENT, 1, 10),
s(Property.TSERV_DATACACHE_SIZE, 0, 1000000000L),
s(Property.TSERV_INDEXCACHE_SIZE, 0, 1000000000L),
s(Property.TSERV_CLIENT_TIMEOUT, 100, 10000),
- s(Property.TSERV_COMPACTION_SERVICE_DEFAULT_EXECUTORS,
1, 10),
+
s(TSERV_COMPACTION_SERVICE_DEFAULT_EXECUTORS_deprecated, 1, 10),
s(Property.TSERV_MAJC_DELAY, 100, 10000),
- s(Property.TSERV_COMPACTION_SERVICE_DEFAULT_MAX_OPEN,
3, 100),
+ s(TSERV_COMPACTION_SERVICE_DEFAULT_MAX_OPEN_deprecated,
3, 100),
s(Property.TSERV_MINC_MAXCONCURRENT, 1, 10),
s(Property.TSERV_DEFAULT_BLOCKSIZE, 100000, 10000000L),
s(Property.TSERV_MAX_IDLE, 10000, 500 * 1000),
