This is an automated email from the ASF dual-hosted git repository. kturner pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 91edd01d8b544c50af572aa8c0bdf2ed45921044 Merge: 257939e609 0942f30ed5 Author: Keith Turner <[email protected]> AuthorDate: Fri Nov 21 20:26:49 2025 +0000 Merge branch '2.1' .../apache/accumulo/tserver/TabletServerResourceManager.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java index 177cc8f9bd,748d74705b..deb5e71146 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java @@@ -784,8 -763,35 +784,13 @@@ public class TabletServerResourceManage } } } - - public TabletServerResourceManager getTabletServerResourceManager() { - return TabletServerResourceManager.this; - } - } - - public void executeSplit(KeyExtent tablet, Runnable splitTask) { - if (tablet.isMeta()) { - if (tablet.isRootTablet()) { - log.warn("Saw request to split root tablet, ignoring"); - return; - } - defaultSplitThreadPool.execute(splitTask); - } else { - splitThreadPool.execute(splitTask); - } - } - - @SuppressWarnings("deprecation") - private static abstract class DispatchParamsImpl implements DispatchParameters, - org.apache.accumulo.core.spi.scan.ScanDispatcher.DispatchParmaters { - } + private static final ScanDispatch ROOT_SCAN_DISPATCH = + ScanDispatch.builder().setExecutorName("root").build(); + private static final ScanDispatch META_SCAN_DISPATCH = + ScanDispatch.builder().setExecutorName("meta").build(); + public void executeReadAhead(KeyExtent tablet, ScanDispatcher dispatcher, ScanSession<?> scanInfo, Runnable task) { @@@ -797,10 -803,10 +802,10 @@@ task.run(); } else if (tablet.isMeta()) { // TODO make meta dispatch?? - scanInfo.scanParams.setScanDispatch(ScanDispatch.builder().build()); - scanExecutors.get("meta").execute(task); + scanInfo.scanParams.setScanDispatch(META_SCAN_DISPATCH); + scanExecutors.get(META_SCAN_DISPATCH.getExecutorName()).execute(task); } else { - DispatchParameters params = new DispatchParamsImpl() { + DispatchParameters params = new DispatchParameters() { // in scan critical path so only create ServiceEnv if needed private final Supplier<ServiceEnvironment> senvSupplier =
