Do the costly stuff in the large threadpool, not in the single thread.

Conflicts:
	vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/GetSearcher.java

1 files changed, 11 insertions, 2 deletions

diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/GetSearcher.java b/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/GetSearcher.java
index 79e2b47c6f3..4efe3a8321b 100755
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/GetSearcher.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/storage/searcher/GetSearcher.java
@@ -85,6 +85,7 @@ public class GetSearcher extends Searcher {
         private Map<String, Integer> ordering;
         private List<DocumentHit> documentHits = new ArrayList<>();
         private List<DefaultErrorHit> errorHits = new ArrayList<>();
+        private List<Reply> replies = new ArrayList<>();
 
         public GetResponse(List<String> documentIds) {
             ordering = new HashMap<>(documentIds.size());
@@ -110,6 +111,15 @@ public class GetSearcher extends Searcher {
                 String str = reply.getTrace().toString();
                 log.log(LogLevel.DEBUG, str);
             }
+            replies.add(reply);
+            return numPending > 0;
+        }
+        private void processReplies() {
+            for (Reply reply : replies) {
+                processReply(reply);
+            }
+        }
+        private void processReply(Reply reply) {
             if (!reply.hasErrors()) {
                 try {
                     addDocumentHit(reply);
@@ -126,8 +136,6 @@ public class GetSearcher extends Searcher {
                     log.log(LogLevel.DEBUG, "Received error reply with message " + reply.getError(0).getMessage());
                 }
             }
-
-            return (numPending > 0);
         }
 
         private void addDocumentHit(Reply reply) {
@@ -385,6 +393,7 @@ public class GetSearcher extends Searcher {
             result.hits().addError(ErrorMessage.createTimeout(
                     "Timed out after waiting "+timeoutMillis+" ms for responses"));
         }
+        response.processReplies();
         if (fieldName != null) {
             handleFieldFiltering(response, result, fieldName, contentType, headersOnly);
         } else {