This is an automated email from the ASF dual-hosted git repository. dlmarion pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 863068cf9307290684d50d2b4bb4abd028466b32 Merge: 060561126b e5745a0c49 Author: Dave Marion <[email protected]> AuthorDate: Thu Oct 8 18:40:53 2026 +0000 Merge branch '2.1' .../org/apache/accumulo/core/conf/Property.java | 10 +++++----- .../accumulo/tserver/TabletClientHandler.java | 16 +++++++++++----- .../accumulo/tserver/ThriftScanClientHandler.java | 21 ++++++++++++++------- 3 files changed, 30 insertions(+), 17 deletions(-) diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java index c6ec906104,e382028561..cec1a3f964 --- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java +++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java @@@ -1741,20 -2055,25 +1741,20 @@@ public enum Property // SSERV options SSERV_CACHED_TABLET_METADATA_REFRESH_PERCENT, SSERV_THREADCHECK, SSERV_CLIENTPORT, - SSERV_PORTSEARCH, SSERV_DATACACHE_SIZE, SSERV_INDEXCACHE_SIZE, SSERV_SUMMARYCACHE_SIZE, - SSERV_DEFAULT_BLOCKSIZE, SSERV_SCAN_REFERENCE_EXPIRATION_TIME, - SSERV_CACHED_TABLET_METADATA_EXPIRATION, SSERV_MINTHREADS, SSERV_MINTHREADS_TIMEOUT, + SSERV_DATACACHE_SIZE, SSERV_INDEXCACHE_SIZE, SSERV_SUMMARYCACHE_SIZE, SSERV_DEFAULT_BLOCKSIZE, + SSERV_SCAN_REFERENCE_EXPIRATION_TIME, SSERV_CACHED_TABLET_METADATA_EXPIRATION, + SSERV_MINTHREADS, SSERV_MINTHREADS_TIMEOUT, SSERV_WAL_SORT_MAX_CONCURRENT, SSERV_GROUP_NAME, // TSERV options - TSERV_TOTAL_MUTATION_QUEUE_MAX, TSERV_WAL_MAX_SIZE, TSERV_WALOG_MAX_SIZE, TSERV_WAL_MAX_AGE, - TSERV_WALOG_MAX_AGE, TSERV_WAL_TOLERATED_CREATION_FAILURES, - TSERV_WALOG_TOLERATED_CREATION_FAILURES, TSERV_WAL_TOLERATED_WAIT_INCREMENT, - TSERV_WALOG_TOLERATED_WAIT_INCREMENT, TSERV_WAL_TOLERATED_MAXIMUM_WAIT_DURATION, - TSERV_WALOG_TOLERATED_MAXIMUM_WAIT_DURATION, TSERV_MAX_IDLE, TSERV_SESSION_MAXIDLE, - TSERV_MAJC_DELAY, TSERV_COMPACTION_SERVICE_DEFAULT_MAX_OPEN, TSERV_MAJC_THREAD_MAXOPEN, - TSERV_MAJC_MAXCONCURRENT, TSERV_MAJC_THROUGHPUT, TSERV_MINC_MAXCONCURRENT, TSERV_MONITOR_FS, - TSERV_HEALTH_CHECK_FREQ, TSERV_THREADCHECK, TSERV_LOG_BUSY_TABLETS_COUNT, - TSERV_LOG_BUSY_TABLETS_INTERVAL, TSERV_WAL_SORT_MAX_CONCURRENT, TSERV_RECOVERY_MAX_CONCURRENT, - TSERV_WORKQ_THREADS, TSERV_SLOW_FILEPERMIT_MILLIS, TSERV_READ_AHEAD_MAXCONCURRENT, - TSERV_METADATA_READ_AHEAD_MAXCONCURRENT, TSERV_WAL_BLOCKSIZE, TSERV_CLIENTPORT, - TSERV_PORTSEARCH, TSERV_MAX_MESSAGE_SIZE, TSERV_CACHE_MANAGER_IMPL, TSERV_DATACACHE_SIZE, - TSERV_INDEXCACHE_SIZE, TSERV_SUMMARYCACHE_SIZE, TSERV_DEFAULT_BLOCKSIZE, TSERV_MINTHREADS, - TSERV_MINTHREADS_TIMEOUT, TSERV_NATIVEMAP_ENABLED, TSERV_MAXMEM, TSERV_SCAN_MAX_OPENFILES, + TSERV_TOTAL_MUTATION_QUEUE_MAX, TSERV_WAL_MAX_SIZE, TSERV_WAL_MAX_AGE, + TSERV_WAL_TOLERATED_CREATION_FAILURES, TSERV_WAL_TOLERATED_WAIT_INCREMENT, + TSERV_WAL_TOLERATED_MAXIMUM_WAIT_DURATION, TSERV_MAX_IDLE, TSERV_SESSION_MAXIDLE, - TSERV_SCAN_RESULTS_MAX_TIMEOUT, TSERV_MINC_MAXCONCURRENT, TSERV_THREADCHECK, - TSERV_LOG_BUSY_TABLETS_COUNT, TSERV_LOG_BUSY_TABLETS_INTERVAL, TSERV_WAL_SORT_MAX_CONCURRENT, - TSERV_SLOW_FILEPERMIT_MILLIS, TSERV_WAL_BLOCKSIZE, TSERV_CLIENTPORT, TSERV_DATACACHE_SIZE, - TSERV_INDEXCACHE_SIZE, TSERV_SUMMARYCACHE_SIZE, TSERV_DEFAULT_BLOCKSIZE, TSERV_MINTHREADS, - TSERV_MINTHREADS_TIMEOUT, TSERV_NATIVEMAP_ENABLED, TSERV_MAXMEM, TSERV_SCAN_MAX_OPENFILES, ++ TSERV_MINC_MAXCONCURRENT, TSERV_THREADCHECK, TSERV_LOG_BUSY_TABLETS_COUNT, ++ TSERV_LOG_BUSY_TABLETS_INTERVAL, TSERV_WAL_SORT_MAX_CONCURRENT, TSERV_SLOW_FILEPERMIT_MILLIS, ++ TSERV_WAL_BLOCKSIZE, TSERV_CLIENTPORT, TSERV_DATACACHE_SIZE, TSERV_INDEXCACHE_SIZE, ++ TSERV_SUMMARYCACHE_SIZE, TSERV_DEFAULT_BLOCKSIZE, TSERV_MINTHREADS, TSERV_MINTHREADS_TIMEOUT, ++ TSERV_NATIVEMAP_ENABLED, TSERV_MAXMEM, TSERV_SCAN_MAX_OPENFILES, + TSERV_ONDEMAND_UNLOADER_INTERVAL, TSERV_GROUP_NAME, // GC options GC_CANDIDATE_BATCH_SIZE, GC_CYCLE_START, GC_PORT, diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/TabletClientHandler.java index d0bb90ed03,eac87f25f3..9907f9762a --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletClientHandler.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletClientHandler.java @@@ -123,17 -132,20 +124,19 @@@ import org.apache.zookeeper.KeeperExcep import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.github.benmanes.caffeine.cache.Cache; + import com.google.common.base.Supplier; + import com.google.common.base.Suppliers; -import com.google.common.cache.Cache; import io.opentelemetry.api.trace.Span; import io.opentelemetry.context.Scope; -public class TabletClientHandler implements TabletClientService.Iface { +public class TabletClientHandler implements TabletServerClientService.Iface, + TabletIngestClientService.Iface, TabletManagementClientService.Iface { private static final Logger log = LoggerFactory.getLogger(TabletClientHandler.class); - private final long MAX_TIME_TO_WAIT_FOR_SCAN_RESULT_MILLIS; + private final Supplier<Long> scanResultWaitTime; - private static final long RECENTLY_SPLIT_MILLIES = MINUTES.toMillis(1); private final TabletServer server; - protected final TransactionWatcher watcher; protected final ServerContext context; protected final AuditedSecurityOperation security; private final WriteTracker writeTracker;
