1 files changed, 8 insertions, 28 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FS4SearchInvoker.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FS4SearchInvoker.java
index d2910ba3fbc..24653db5671 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FS4SearchInvoker.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FS4SearchInvoker.java
@@ -12,13 +12,11 @@ import com.yahoo.search.Result;
 import com.yahoo.search.dispatch.ResponseMonitor;
 import com.yahoo.search.dispatch.SearchInvoker;
 import com.yahoo.search.dispatch.searchcluster.Node;
-import com.yahoo.search.result.Coverage;
 import com.yahoo.search.result.ErrorMessage;
 import com.yahoo.search.searchchain.Execution;
 
 import java.io.IOException;
 import java.util.Optional;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
@@ -27,6 +25,7 @@ import java.util.logging.Logger;
  * @author ollivir
  */
 public class FS4SearchInvoker extends SearchInvoker implements ResponseMonitor<FS4Channel> {
+    private static final Logger log = Logger.getLogger(FS4SearchInvoker.class.getName());
 
     private final VespaBackEndSearcher searcher;
     private FS4Channel channel;
@@ -46,8 +45,7 @@ public class FS4SearchInvoker extends SearchInvoker implements ResponseMonitor<F
 
     @Override
     protected void sendSearchRequest(Query query, QueryPacket queryPacket) throws IOException {
-        if (isLoggingFine())
-            getLogger().finest("sending query packet");
+        log.finest("sending query packet");
 
         if (queryPacket == null) {
             // query changed for subchannel
@@ -77,30 +75,28 @@ public class FS4SearchInvoker extends SearchInvoker implements ResponseMonitor<F
     @Override
     protected Result getSearchResult(Execution execution) throws IOException {
         if (pendingSearchError != null) {
-            return errorResult(pendingSearchError);
+            return errorResult(query, pendingSearchError);
         }
         BasicPacket[] basicPackets;
 
         try {
             basicPackets = channel.receivePackets(query.getTimeLeft(), 1);
         } catch (ChannelTimeoutException e) {
-            return errorResult(ErrorMessage.createTimeout("Timeout while waiting for " + getName()));
+            return errorResult(query, ErrorMessage.createTimeout("Timeout while waiting for " + getName()));
         } catch (InvalidChannelException e) {
-            return errorResult(ErrorMessage.createBackendCommunicationError("Invalid channel for " + getName()));
+            return errorResult(query, ErrorMessage.createBackendCommunicationError("Invalid channel for " + getName()));
         }
 
         if (basicPackets.length == 0) {
-            return errorResult(ErrorMessage.createBackendCommunicationError(getName() + " got no packets back"));
+            return errorResult(query, ErrorMessage.createBackendCommunicationError(getName() + " got no packets back"));
         }
 
-        if (isLoggingFine())
-            getLogger().finest("got packets " + basicPackets.length + " packets");
+        log.finest(() -> "got packets " + basicPackets.length + " packets");
 
         basicPackets[0].ensureInstanceOf(QueryResultPacket.class, getName());
         QueryResultPacket resultPacket = (QueryResultPacket) basicPackets[0];
 
-        if (isLoggingFine())
-            getLogger().finest("got query packet. " + "docsumClass=" + query.getPresentation().getSummary());
+        log.finest(() -> "got query packet. " + "docsumClass=" + query.getPresentation().getSummary());
 
         if (query.getPresentation().getSummary() == null)
             query.getPresentation().setSummary(searcher.getDefaultDocsumClass());
@@ -114,14 +110,6 @@ public class FS4SearchInvoker extends SearchInvoker implements ResponseMonitor<F
         return result;
     }
 
-    private Result errorResult(ErrorMessage errorMessage) {
-        Result error = new Result(query, errorMessage);
-        Coverage errorCoverage = new Coverage(0, 0, 0);
-        errorCoverage.setNodesTried(1);
-        error.setCoverage(errorCoverage);
-        return error;
-    }
-
     @Override
     public void release() {
         if (channel != null) {
@@ -134,14 +122,6 @@ public class FS4SearchInvoker extends SearchInvoker implements ResponseMonitor<F
         return searcher.getName();
     }
 
-    private Logger getLogger() {
-        return searcher.getLogger();
-    }
-
-    private boolean isLoggingFine() {
-        return getLogger().isLoggable(Level.FINE);
-    }
-
     @Override
     public void responseAvailable(FS4Channel from) {
         responseAvailable();