This is an automated email from the ASF dual-hosted git repository. edcoleman pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit a41366bbd2690c05314b37f360ace26b16bb1aa6 Merge: 7f58fc03b2 42e218e903 Author: Ed Coleman <edcole...@apache.org> AuthorDate: Mon May 6 19:53:36 2024 +0000 Merge remote-tracking branch 'upstream/2.1' .../accumulo/core/clientImpl/TabletServerBatchReaderIterator.java | 6 ++++-- .../java/org/apache/accumulo/core/clientImpl/ThriftScanner.java | 7 ++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --cc core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftScanner.java index 87726fd639,604aece29d..f36944daaf --- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftScanner.java +++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftScanner.java @@@ -567,13 -567,15 +567,14 @@@ public class ThriftScanner delay = actions.getDelay(); scanState.busyTimeout = actions.getBusyTimeout(); log.trace( - "For tablet {} scan server selector chose scan_server:{} delay:{} busyTimeout:{}", - loc.getExtent(), scanServer, delay, scanState.busyTimeout); + "For tablet {} using hints {} scan server selector chose scan_server:{} delay:{} busyTimeout:{}", - loc.tablet_extent, scanState.executionHints, scanServer, delay, - scanState.busyTimeout); ++ loc.getExtent(), scanState.executionHints, scanServer, delay, scanState.busyTimeout); } else { newLoc = loc; delay = actions.getDelay(); scanState.busyTimeout = Duration.ZERO; - log.trace("For tablet {} scan server selector chose tablet_server", loc.getExtent()); + log.trace("For tablet {} using hints {} scan server selector chose tablet_server", - loc.tablet_extent, scanState.executionHints); ++ loc.getExtent(), scanState.executionHints); } if (!delay.isZero()) {