Merge pull request #269 from ddanielr/fix-property-deprecations

Fixes property deprecation build errors
apache · Jan 2, 2024 · 6611044 · 6611044
2 parents 9cdafdb + 725b723
commit 6611044
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git 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
@@ -56,15 +56,24 @@ static Setting s(Property property, long min, long max) {
 
   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),