Fix query timeout handling by checking searchContext.isSearchTimedOut()

Signed-off-by: Andriy Redko <[email protected]>
opensearch-project · Dec 18, 2024 · 43e54c0 · 43e54c0
1 parent b5f651f
commit 43e54c0
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java b/server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java
@@ -282,11 +282,20 @@ protected void search(List<LeafReaderContext> leaves, Weight weight, Collector c
             // reader order here.
             if (searchContext.shouldUseTimeSeriesDescSortOptimization()) {
                 for (int i = leaves.size() - 1; i >= 0; i--) {
+                    // If search is already flagged as timed out, do not continue
                     searchLeaf(leaves.get(i), weight, collector);
+                    // If search is already flagged as timed out, do not continue
+                    if (searchContext.isSearchTimedOut()) {
+                        return;
+                    }
                 }
             } else {
                 for (int i = 0; i < leaves.size(); i++) {
                     searchLeaf(leaves.get(i), weight, collector);
+                    // If search is already flagged as timed out, do not continue
+                    if (searchContext.isSearchTimedOut()) {
+                        return;
+                    }
                 }
             }
             searchContext.bucketCollectorProcessor().processPostCollection(collector);