Skip to content
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

[Extensions] Fix timeout error when adding a document to an index with extension running #6275

Merged
merged 4 commits into from
Feb 13, 2023
+14 −11
Merged

[Extensions] Fix timeout error when adding a document to an index with extension running #6275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b2a0d44
Fix timeout error when adding a document to an index with extension r…
ryanbogan Feb 9, 2023
386ed6b
Add CHANGELOG entry
ryanbogan Feb 9, 2023
0baf855
Merge main into fix_timeout_error
ryanbogan Feb 9, 2023
eef875a
Merge main into fix_timeout
ryanbogan Feb 13, 2023
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Add support for ppc64le architecture ([#5459](https://github.com/opensearch-project/OpenSearch/pull/5459))
- [Segment Replication] Add primary weight factor for balanced primary distribution ([#6017](https://github.com/opensearch-project/OpenSearch/pull/6017))
- Add a setting to control auto release of OpenSearch managed index creation block ([#6277](https://github.com/opensearch-project/OpenSearch/pull/6277))
- Fix timeout error when adding a document to an index with extension running ([#6275](https://github.com/opensearch-project/OpenSearch/pull/6275))

### Dependencies
- Update nebula-publishing-plugin to 19.2.0 ([#5704](https://github.com/opensearch-project/OpenSearch/pull/5704))
Expand Down
24 changes: 13 additions & 11 deletions server/src/main/java/org/opensearch/extensions/ExtensionsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,21 +502,23 @@ public void beforeIndexRemoved(
new IndicesModuleRequest(indexModule),
acknowledgedResponseHandler
);
inProgressIndexNameFuture.whenComplete((r, e) -> {
if (e != null) {
inProgressFuture.complete(response);
} else if (e == null) {
inProgressFuture.completeExceptionally(e);
}
});
} catch (Exception ex) {
inProgressFuture.completeExceptionally(ex);
inProgressIndexNameFuture.orTimeout(EXTENSION_REQUEST_WAIT_TIMEOUT, TimeUnit.SECONDS).join();
} catch (CompletionException e) {
if (e.getCause() instanceof TimeoutException) {
logger.info("No response from extension to request.");
}
if (e.getCause() instanceof RuntimeException) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

curious why this isn't an else if like line 512.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure - I should fix that

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually I think it's intentional, because no exception handling happens in the first if statement: there's only an additional logging statement. The other if/else ifs actually handle the exception.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I see. A timeout is a runtime exception so we log and throw.

throw (RuntimeException) e.getCause();
} else if (e.getCause() instanceof Error) {
throw (Error) e.getCause();
owaiskazi19 marked this conversation as resolved.
Show resolved Hide resolved
} else {
throw new RuntimeException(e.getCause());
}
}
}
});
} else {
inProgressFuture.complete(response);
}
inProgressFuture.complete(response);
}

@Override
Expand Down