Trace fill request

2 files changed, 14 insertions, 21 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/Searcher.java b/container-search/src/main/java/com/yahoo/search/Searcher.java
index 3c4d3332144..69025271430 100644
--- a/container-search/src/main/java/com/yahoo/search/Searcher.java
+++ b/container-search/src/main/java/com/yahoo/search/Searcher.java
@@ -161,6 +161,13 @@ public abstract class Searcher extends Processor {
         if ( ! result.isFilled(summaryClass)) {
             fill(result, summaryClass, execution);
         }
+        else {
+            int fillRejectTraceAt = 3;
+            if (result.getQuery().getTraceLevel() >= fillRejectTraceAt)
+                result.getQuery().trace("Ignoring fill(" + summaryClass + "): " +
+                                        ( result.hits().getFilled() == null ? "Hits are unfillable" : "Hits already filled" ) +
+                                        ": result.hits().getFilled()=" + result.hits().getFilled(), fillRejectTraceAt);
+        }
     }
 
     /** Returns a logger unique for the instance subclass */
diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java b/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java
index b53ade45d07..cde03c9069d 100644
--- a/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java
+++ b/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java
@@ -516,9 +516,7 @@ public class Execution extends com.yahoo.processing.execution.Execution {
         final int traceDependencies = 6;
         Query query = (Query) request;
         if (query.getTraceLevel() >= traceDependencies) {
-            query.trace(new StringBuilder().append(processor.getId())
-                    .append(" ").append(processor.getDependencies().toString())
-                    .toString(), traceDependencies);
+            query.trace(processor.getId() + " " + processor.getDependencies(), traceDependencies);
         }
     }
 
@@ -582,27 +580,15 @@ public class Execution extends com.yahoo.processing.execution.Execution {
     }
 
     private void onInvokingFill(Searcher searcher, Result result, String summaryClass) {
-        /* TODO
-        final int traceDependencies = 6;
-        Query query = (Query) request;
-        if (query.getTraceLevel() >= traceDependencies) {
-            query.trace(new StringBuilder().append(processor.getId())
-                                .append(" ").append(processor.getDependencies().toString())
-                                .toString(), traceDependencies);
-        }
-        */
+        int traceFillAt = 5;
+        if (trace().getTraceLevel() < traceFillAt) return;
+        trace().trace("Invoke fill(" + summaryClass + ") on " + searcher, traceFillAt);
     }
 
     private void onReturningFill(Searcher searcher, Result result, String summaryClass) {
-        /* TODO
-        final int traceDependencies = 6;
-        Query query = (Query) request;
-        if (query.getTraceLevel() >= traceDependencies) {
-            query.trace(new StringBuilder().append(processor.getId())
-                                .append(" ").append(processor.getDependencies().toString())
-                                .toString(), traceDependencies);
-        }
-        */
+        int traceFillAt = 5;
+        if (trace().getTraceLevel() < traceFillAt) return;
+        trace().trace("Return fill(" + summaryClass + ") on " + searcher, traceFillAt);
     }
 
     /** Calls ping on the next search in this chain. If there is no next, a Pong is created and returned. */