Unify trace messages so that execution path can be tested and verified runtime.

1 files changed, 6 insertions, 5 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcFillInvoker.java b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcFillInvoker.java
index aa72823c809..0d3f2e7d0a1 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcFillInvoker.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcFillInvoker.java
@@ -42,10 +42,8 @@ public class RpcFillInvoker extends FillInvoker {
 
     private final DocumentDatabase documentDb;
     private final RpcResourcePool resourcePool;
-
     private GetDocsumsResponseReceiver responseReceiver;
 
-
     RpcFillInvoker(RpcResourcePool resourcePool, DocumentDatabase documentDb) {
         this.documentDb = documentDb;
         this.resourcePool = resourcePool;
@@ -54,12 +52,15 @@ public class RpcFillInvoker extends FillInvoker {
     @Override
     protected void sendFillRequest(Result result, String summaryClass) {
         ListMap<Integer, FastHit> hitsByNode = hitsByNode(result);
+        Query query = result.getQuery();
 
         CompressionType compression = CompressionType
-                .valueOf(result.getQuery().properties().getString(RpcResourcePool.dispatchCompression, "LZ4").toUpperCase());
+                .valueOf(query.properties().getString(RpcResourcePool.dispatchCompression, "LZ4").toUpperCase());
 
-        if (result.getQuery().getTraceLevel() >= 3)
-            result.getQuery().trace("Sending " + hitsByNode.size() + " summary fetch RPC requests", 3);
+        if (query.getTraceLevel() >= 3) {
+            query.trace("Sending " + hitsByNode.size() + " summary fetch RPC requests", 3);
+            query.trace("RpcSlime: Not resending query during document summary fetching", 3);
+        }
 
         responseReceiver = new GetDocsumsResponseReceiver(hitsByNode.size(), resourcePool.compressor(), result);
         for (Map.Entry<Integer, List<FastHit>> nodeHits : hitsByNode.entrySet()) {