This is an automated email from the ASF dual-hosted git repository. cshannon pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit f5885481e32f6e7ffc41d391530654156e1a8522 Merge: 8e5d967f24 5d3ccec0df Author: Christopher L. Shannon <[email protected]> AuthorDate: Sat May 25 08:08:36 2024 -0400 Merge branch '2.1' .../org/apache/accumulo/core/conf/Property.java | 11 +++- .../org/apache/accumulo/tserver/ScanServer.java | 37 +++++++++++- .../test/ScanServerConcurrentTabletScanIT.java | 69 ++++++++++++++++++++-- 3 files changed, 107 insertions(+), 10 deletions(-) diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java index 463b37cbcf,fe4b8f4c18..aa6533bb53 --- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java +++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java @@@ -428,17 -445,19 +428,26 @@@ public enum Property SSERV_DEFAULT_BLOCKSIZE("sserver.default.blocksize", "1M", PropertyType.BYTES, "Specifies a default blocksize for the scan server caches.", "2.1.0"), @Experimental + SSERV_GROUP_NAME("sserver.group", ScanServerSelector.DEFAULT_SCAN_SERVER_GROUP_NAME, + PropertyType.STRING, + "Optional group name that will be made available to the " + + "ScanServerSelector client plugin. Groups support at least two use cases:" + + " dedicating resources to scans and/or using different hardware for scans.", + "3.0.0"), + @Experimental SSERV_CACHED_TABLET_METADATA_EXPIRATION("sserver.cache.metadata.expiration", "5m", - PropertyType.TIMEDURATION, "The time after which cached tablet metadata will be refreshed.", + PropertyType.TIMEDURATION, + "The time after which cached tablet metadata will be expired if not previously refreshed.", "2.1.0"), @Experimental + SSERV_CACHED_TABLET_METADATA_REFRESH_PERCENT("sserver.cache.metadata.refresh.percent", ".75", + PropertyType.FRACTION, + "The time after which cached tablet metadata will be refreshed, expressed as a " + + "percentage of the expiration time. Cache hits after this time, but before the " + + "expiration time, will trigger a background refresh for future hits. " + + "Value must be less than 100%. Set to 0 will disable refresh.", + "2.1.3"), + @Experimental SSERV_PORTSEARCH("sserver.port.search", "true", PropertyType.BOOLEAN, "if the ports above are in use, search higher ports until one is available.", "2.1.0"), @Experimental diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java index 616800168e,3b52ecf0fd..201bfada4f --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java @@@ -416,7 -439,12 +442,12 @@@ public class ScanServer extends Abstrac LOG.warn("Failed to close filesystem : {}", e.getMessage(), e); } + if (tmCacheExecutor != null) { + LOG.debug("Shutting down TabletMetadataCache executor"); + tmCacheExecutor.shutdownNow(); + } + - gcLogger.logGCInfo(getConfiguration()); + context.getLowMemoryDetector().logGCInfo(getConfiguration()); LOG.info("stop requested. exiting ... "); try { if (null != lock) {
