updating error handling

pmpailis · Oct 18, 2024 · 5a564ed · 5a564ed
1 parent 6f60880
commit 5a564ed
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/server/src/main/java/org/elasticsearch/search/retriever/CompoundRetrieverBuilder.java b/server/src/main/java/org/elasticsearch/search/retriever/CompoundRetrieverBuilder.java
@@ -134,9 +134,15 @@ public void onResponse(MultiSearchResponse items) {
                         }
                     }
                     if (false == failures.isEmpty()) {
-                        IllegalStateException ex = new IllegalStateException("Search failed - some nested retrievers returned errors.");
-                        failures.forEach(ex::addSuppressed);
-                        listener.onFailure(ex);
+                        if (failures.size() == 1) {
+                            listener.onFailure(failures.getFirst());
+                        } else {
+                            IllegalArgumentException ex = new IllegalArgumentException(
+                                "[" + getName() + "] search failed - some nested retrievers returned errors."
+                            );
+                            failures.forEach(ex::addSuppressed);
+                            listener.onFailure(ex);
+                        }
                     } else {
                         results.set(combineInnerRetrieverResults(topDocs));
                         listener.onResponse(null);