Do not throw in task enqueued by CancellableRunner#112780
Merged
elasticsearchmachine merged 3 commits intoelastic:mainfrom Sep 12, 2024
Merged
Do not throw in task enqueued by CancellableRunner#112780elasticsearchmachine merged 3 commits intoelastic:mainfrom
elasticsearchmachine merged 3 commits intoelastic:mainfrom
Conversation
CancellableThreads#eecute can throw runtime exception including cancellation. This does not work with AbstractThrottledTaskRunner which expects enqueued task to _not_ throw. This PR catches any runtime exception from CancellableThreads and hand it back to the original runnable. Resolves: elastic#112779
Collaborator
|
Pinging @elastic/es-distributed (Team:Distributed) |
DaveCTurner
approved these changes
Sep 12, 2024
Member
DaveCTurner
left a comment
There was a problem hiding this comment.
LGTM thanks Yang. I wonder if we should make it so that CancellableThreads#execute doesn't throw anything itself, or introduce a variant which integrates better with AbstractRunnable, but that's a question for a later day.
Member
Author
|
@elasticmachine update branch |
Collaborator
💔 Backport failed
You can use sqren/backport to manually backport by running |
ywangd
added a commit
to ywangd/elasticsearch
that referenced
this pull request
Sep 12, 2024
CancellableThreads#excute can throw runtime exception including cancellation. This does not work with AbstractThrottledTaskRunner which expects enqueued task to _not_ throw. This PR catches any runtime exception from CancellableThreads and hand it back to the original runnable. Resolves: elastic#112779 (cherry picked from commit e22bef6) # Conflicts: # muted-tests.yml
Member
Author
💚 All backports created successfully
Questions ?Please refer to the Backport tool documentation |
v1v
added a commit
to v1v/elasticsearch
that referenced
this pull request
Sep 12, 2024
…tion-ironbank-ubi * upstream/main: (302 commits) Deduplicate BucketOrder when deserializing (elastic#112707) Introduce test utils for ingest pipelines (elastic#112733) [Test] Account for auto-repairing for shard gen file (elastic#112778) Do not throw in task enqueued by CancellableRunner (elastic#112780) Mute org.elasticsearch.script.StatsSummaryTests testEqualsAndHashCode elastic#112439 Mute org.elasticsearch.repositories.blobstore.testkit.integrity.RepositoryVerifyIntegrityIT testTransportException elastic#112779 Use a dedicated test executor in MockTransportService (elastic#112748) Estimate segment field usages (elastic#112760) (Doc+) Inference Pipeline ignores Mapping Analyzers (elastic#112522) Fix verifyVersions task (elastic#112765) (Doc+) Terminating Exit Codes (elastic#112530) (Doc+) CAT Nodes default columns (elastic#112715) [DOCS] Augment installation warnings (elastic#112756) Mute org.elasticsearch.repositories.blobstore.testkit.integrity.RepositoryVerifyIntegrityIT testCorruption elastic#112769 Bump Elasticsearch to a minimum of JDK 21 (elastic#112252) ESQL: Compute support for filtering ungrouped aggs (elastic#112717) Bump Elasticsearch version to 9.0.0 (elastic#112570) add CDR related data streams to kibana_system priviliges (elastic#112655) Support widening of numeric types in union-types (elastic#112610) Introduce data stream options and failure store configuration classes (elastic#109515) ...
elasticsearchmachine
pushed a commit
that referenced
this pull request
Sep 12, 2024
…112786) * Do not throw in task enqueued by CancellableRunner (#112780) CancellableThreads#excute can throw runtime exception including cancellation. This does not work with AbstractThrottledTaskRunner which expects enqueued task to _not_ throw. This PR catches any runtime exception from CancellableThreads and hand it back to the original runnable. Resolves: #112779 (cherry picked from commit e22bef6) # Conflicts: # muted-tests.yml * Update muted-tests.yml * Update muted-tests.yml --------- Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
davidkyle
pushed a commit
that referenced
this pull request
Sep 12, 2024
CancellableThreads#excute can throw runtime exception including cancellation. This does not work with AbstractThrottledTaskRunner which expects enqueued task to _not_ throw. This PR catches any runtime exception from CancellableThreads and hand it back to the original runnable. Resolves: #112779
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
CancellableThreads#excute can throw runtime exception including cancellation. This does not work with AbstractThrottledTaskRunner which expects enqueued task to not throw. This PR catches any runtime exception from CancellableThreads and hand it back to the original runnable.
Resolves: #112779