Merge pull request #8177 from vespa-engine/ollivir/rectify-timeout-error-type

Produce a single timeout error instead of communication error when search times out

1 files changed, 6 insertions, 9 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java b/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java
index d695c108533..fd861ab7c02 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java
@@ -21,6 +21,7 @@ import java.util.Set;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
 
 import static com.yahoo.container.handler.Coverage.DEGRADED_BY_ADAPTIVE_TIMEOUT;
 import static com.yahoo.container.handler.Coverage.DEGRADED_BY_MATCH_PHASE;
@@ -135,15 +136,11 @@ public class InterleavedSearchInvoker extends SearchInvoker implements ResponseM
     }
 
     private void insertTimeoutErrors() {
-        for (SearchInvoker invoker : invokers) {
-            Optional<Integer> dk = invoker.distributionKey();
-            String message;
-            if (dk.isPresent()) {
-                message = "Backend communication timeout on node with distribution-key " + dk.get();
-            } else {
-                message = "Backend communication timeout";
-            }
-            result.hits().addError(ErrorMessage.createBackendCommunicationError(message));
+        if (!invokers.isEmpty()) {
+            String keys = invokers.stream().map(SearchInvoker::distributionKey).map(dk -> dk.map(i -> i.toString()).orElse("(unspecified)"))
+                    .collect(Collectors.joining(", "));
+
+            result.hits().addError(ErrorMessage.createTimeout("Backend communication timeout on nodes with distribution-keys: " + keys));
             timedOut = true;
         }
     }