Skip to content

[8.x] Do not throw in task enqueued by CancellableRunner (#112780)#112786

Merged
elasticsearchmachine merged 4 commits intoelastic:8.xfrom
ywangd:backport/8.x/pr-112780
Sep 12, 2024
Merged

[8.x] Do not throw in task enqueued by CancellableRunner (#112780)#112786
elasticsearchmachine merged 4 commits intoelastic:8.xfrom
ywangd:backport/8.x/pr-112780

Conversation

@ywangd
Copy link
Copy Markdown
Member

@ywangd ywangd commented Sep 12, 2024

Backport

This will backport the following commits from main to 8.x:

Questions ?

Please refer to the Backport tool documentation

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
@ywangd ywangd added the auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) label Sep 12, 2024
@ywangd
Copy link
Copy Markdown
Member Author

ywangd commented Sep 12, 2024

@elasticmachine update branch

@elasticsearchmachine elasticsearchmachine merged commit 8d87b1c into elastic:8.x Sep 12, 2024
@ywangd ywangd deleted the backport/8.x/pr-112780 branch September 12, 2024 09:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) backport v8.16.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants