diff options
| author | Tom <58065733+tomglk@users.noreply.github.com> | 2024-01-03 20:26:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-03 20:26:46 +0100 |
| commit | d9198f2bbaa3790cbd614fc6bbd7b60bd365d602 (patch) | |
| tree | dd1f3f25f363dae66c49a5b21db384a127d0dcdb /container-search/src/main/java/com/yahoo/prelude | |
| parent | 5614a846b5c4d6980a9880577ffa9253a2112ce0 (diff) | |
| parent | 776ace0650b26fd6ba0e1452c81c139d7554834d (diff) | |
Merge branch 'vespa-engine:master' into multifield-collapsing
Diffstat (limited to 'container-search/src/main/java/com/yahoo/prelude')
| -rw-r--r-- | container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java index e20c4271fe0..441c4326355 100644 --- a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java +++ b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java @@ -270,7 +270,12 @@ public class ClusterSearcher extends Searcher { Result result = task.get(); mergedResult.mergeWith(result); mergedResult.hits().addAll(result.hits().asUnorderedHits()); - } catch (ExecutionException | InterruptedException e) { + } catch (ExecutionException e) { + mergedResult.hits().addError(ErrorMessage.createInternalServerError("Failed querying '" + + query.getModel().getRestrict() + "': " + + Exceptions.toMessageString(e), + e)); + } catch (InterruptedException e) { mergedResult.hits().addError(ErrorMessage.createInternalServerError("Failed querying '" + query.getModel().getRestrict() + "': " + Exceptions.toMessageString(e))); |