Skip to content

Handle any exception thrown while generating source for an IngestDocument #91981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 29, 2022
Merged

Handle any exception thrown while generating source for an IngestDocument #91981

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1cefa2f
Handle any exception thrown while generating source
joegallo Nov 28, 2022
0954d7b
Update docs/changelog/91981.yaml
joegallo Nov 28, 2022
03aadbe
Widen the wrapping exception
joegallo Nov 28, 2022
6d5c870
Use two catch blocks
joegallo Nov 28, 2022
6a5bb43
Reword this comment slightly
joegallo Nov 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/changelog/91981.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 91981
summary: Handle any exception thrown while generating source for an `IngestDocument`
area: Ingest Node
type: bug
issues: []
12 changes: 6 additions & 6 deletions server/src/main/java/org/elasticsearch/ingest/IngestService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -944,13 +944,13 @@ private void innerExecute(
try {
boolean ensureNoSelfReferences = ingestDocument.doNoSelfReferencesCheck();
indexRequest.source(ingestDocument.getSource(), indexRequest.getContentType(), ensureNoSelfReferences);
} catch (IllegalArgumentException ex) {
// An IllegalArgumentException can be thrown when an ingest
// processor creates a source map that is self-referencing.
// In that case, we catch and wrap the exception so we can
// include which pipeline failed.
} catch (Exception ex) {
// An IllegalArgumentException can be thrown when an ingest processor creates a source map that is self-referencing.
// Rarely, a ConcurrentModificationException can be thrown if a pipeline leaks a reference to a shared mutable
// collection, and another indexing thread modifies the shared reference while we're trying to ensure it has
// no self references. If anything goes wrong here, we want to know, but also cannot proceed with normal execution.
handler.accept(
new IllegalArgumentException(
new RuntimeException(
"Failed to generate the source document for ingest pipeline [" + pipeline.getId() + "]",
ex
)
Expand Down