#74 Tweaking on distrib updates.

apache · Jul 11, 2020 · efe04ea · efe04ea
1 parent 172e276
commit efe04ea
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
@@ -262,18 +262,21 @@ public void distribCommit(CommitUpdateCommand cmd, List<Node> nodes,
       addCommit(uReq, cmd);
       submit(new Req(cmd, node, uReq, false), true);
     }
-    // wait for any async commits to complete
-    while (pending != null && pending.size() > 0) {
-      Future<Object> future = null;
-      try {
-        future = completionService.take();
-      } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
-        log.error("blockAndDoRetries interrupted", e);
-        return;
+    if (cmd.waitSearcher) {
+      // only if wait for searcher?.,l
+      // wait for any async commits to complete
+      while (pending != null && pending.size() > 0) {
+        Future<Object> future = null;
+        try {
+          future = completionService.take();
+        } catch (InterruptedException e) {
+          Thread.currentThread().interrupt();
+          log.error("blockAndDoRetries interrupted", e);
+          return;
+        }
+        if (future == null) return;
+        pending.remove(future);
       }
-      if (future == null) return;
-      pending.remove(future);
     }
 
   }