This is an automated email from the ASF dual-hosted git repository.
dlmarion pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 47b54a6bcf916266d842c1df836d4d1167d6d7c0
Merge: 8b8a49f573 171fdcd7f5
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Fri Feb 9 14:48:36 2024 +0000
Merge branch 'main' into elasticity
.../java/org/apache/accumulo/core/Constants.java | 2 -
.../org/apache/accumulo/core/conf/Property.java | 4 --
.../accumulo/core/util/threads/ThreadPools.java | 3 -
.../MiniAccumuloClusterClasspathTest.java | 2 +-
.../minicluster/MiniAccumuloClusterTest.java | 4 +-
.../accumulo/tserver/BulkFailedCopyProcessor.java | 81 ----------------------
.../org/apache/accumulo/tserver/TabletServer.java | 20 +-----
.../org/apache/accumulo/tserver/log/LogSorter.java | 25 ++++---
8 files changed, 16 insertions(+), 125 deletions(-)
diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 777d2f8a3d,9acce283cd..bec38ca3ea
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@@ -688,10 -721,12 +688,6 @@@ public enum Property
+ " that begin with 'table.file' can be used here. For example, to
set the compression"
+ " of the sorted recovery files to snappy use
'tserver.wal.sort.file.compress.type=snappy'.",
"2.1.0"),
- @Deprecated(since = "2.1.3")
-- TSERV_WORKQ_THREADS("tserver.workq.threads", "2", PropertyType.COUNT,
-- "The number of threads for the distributed work queue. These threads
are"
- + " used for copying failed bulk import RFiles.",
- + " used for copying failed bulk import RFiles. Note that as of
version 3.1.0 this property"
- + " is not used and will be removed in a future release.",
-- "1.4.2"),
TSERV_WAL_SYNC("tserver.wal.sync", "true", PropertyType.BOOLEAN,
"Use the SYNC_BLOCK create flag to sync WAL writes to disk. Prevents"
+ " problems recovering from sudden system resets.",
diff --cc
core/src/main/java/org/apache/accumulo/core/util/threads/ThreadPools.java
index 44a261a062,12adfc5c98..cf364f8722
--- a/core/src/main/java/org/apache/accumulo/core/util/threads/ThreadPools.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/threads/ThreadPools.java
@@@ -260,9 -260,9 +260,6 @@@ public class ThreadPools
} else {
return createFixedThreadPool(threads, "GatherTableInformation",
emitThreadPoolMetrics);
}
-- case TSERV_WORKQ_THREADS:
-- return createFixedThreadPool(conf.getCount(p), "distributed work
queue",
-- emitThreadPoolMetrics);
case TSERV_MINC_MAXCONCURRENT:
return createFixedThreadPool(conf.getCount(p), 0L, MILLISECONDS,
"minor compactor",
emitThreadPoolMetrics);
diff --cc
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 93a1de666d,12227f2576..90244c3ba1
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@@ -125,8 -125,12 +123,7 @@@ import org.apache.accumulo.server.rpc.T
import org.apache.accumulo.server.security.SecurityOperation;
import org.apache.accumulo.server.security.SecurityUtil;
import
org.apache.accumulo.server.security.delegation.ZooAuthenticationKeyWatcher;
-import org.apache.accumulo.server.util.ServerBulkImportStatus;
import org.apache.accumulo.server.util.time.RelativeTime;
- import org.apache.accumulo.server.zookeeper.DistributedWorkQueue;
-import org.apache.accumulo.server.zookeeper.TransactionWatcher;
-import
org.apache.accumulo.tserver.TabletServerResourceManager.TabletResourceManager;
-import org.apache.accumulo.tserver.TabletStatsKeeper.Operation;
-import org.apache.accumulo.tserver.compactions.CompactionManager;
import org.apache.accumulo.tserver.log.DfsLogger;
import org.apache.accumulo.tserver.log.LogSorter;
import org.apache.accumulo.tserver.log.MutationReceiver;
