(accumulo) branch 2.1 updated: logs hints used to select a scan server (#4520)

[kturner]

This is an automated email from the ASF dual-hosted git repository.

kturner pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/2.1 by this push:
     new 42e218e903 logs hints used to select a scan server (#4520)
42e218e903 is described below

commit 42e218e903117c110106412ba8252941cc86fb57
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Sun May 5 21:26:00 2024 -0400

    logs hints used to select a scan server (#4520)
---
 .../accumulo/core/clientImpl/TabletServerBatchReaderIterator.java | 6 ++++--
 .../java/org/apache/accumulo/core/clientImpl/ThriftScanner.java   | 8 +++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchReaderIterator.java
 
b/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchReaderIterator.java
index 963a9f2c4a..8f30ded1c6 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchReaderIterator.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/clientImpl/TabletServerBatchReaderIterator.java
@@ -652,9 +652,11 @@ public class TabletServerBatchReaderIterator implements 
Iterator<Entry<Key,Value
       if (serverToUse == null) {
         // no scan server was given so use the tablet server
         serverToUse = extentToTserverMap.get(extent);
-        log.trace("For tablet {} scan server selector chose tablet_server", 
tabletId);
+        log.trace("For tablet {} using hints {} scan server selector chose 
tablet_server", tabletId,
+            options.executionHints);
       } else {
-        log.trace("For tablet {} scan server selector chose scan_server:{}", 
tabletId, serverToUse);
+        log.trace("For tablet {} using hints {} scan server selector chose 
scan_server:{}",
+            tabletId, options.executionHints, serverToUse);
       }
 
       var rangeMap = binnedRanges2.computeIfAbsent(serverToUse, k -> new 
HashMap<>());
diff --git 
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftScanner.java 
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ThriftScanner.java
index 26ddf5abc2..604aece29d 100644
--- 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 @@ public class ThriftScanner {
           delay = actions.getDelay();
           scanState.busyTimeout = actions.getBusyTimeout();
           log.trace(
-              "For tablet {} scan server selector chose scan_server:{} 
delay:{} busyTimeout:{}",
-              loc.tablet_extent, 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);
         } else {
           newLoc = loc;
           delay = actions.getDelay();
           scanState.busyTimeout = Duration.ZERO;
-          log.trace("For tablet {} scan server selector chose tablet_server", 
loc.tablet_extent);
+          log.trace("For tablet {} using hints {} scan server selector chose 
tablet_server",
+              loc.tablet_extent, scanState.executionHints);
         }
 
         if (!delay.isZero()) {