Make sure listener is resolved when file queue is cleared#89929
Merged
pxsalehi merged 7 commits intoelastic:mainfrom Sep 9, 2022
Merged
Make sure listener is resolved when file queue is cleared#89929pxsalehi merged 7 commits intoelastic:mainfrom
pxsalehi merged 7 commits intoelastic:mainfrom
Conversation
Collaborator
|
Pinging @elastic/es-distributed (Team:Distributed) |
Collaborator
|
Hi @pxsalehi, I've created a changelog YAML for you. |
Member
Author
|
|
e8ab227 to
d9c3ca6
Compare
Contributor
original-brownbear
left a comment
There was a problem hiding this comment.
Thanks for fixing this so quickly @pxsalehi ! The fix looks fine, just one complaint about a test detail :)
| files.add(ShardSnapshotTaskRunnerTests.dummyFileInfo()); | ||
| } | ||
| repository.snapshotFiles(context, files, allFilesUploadListener); | ||
| assertBusy(() -> assertTrue(listenerCalled.get())); |
Contributor
There was a problem hiding this comment.
I kind of dislike this pattern in tests, it causes test to be needlessly slow in aggregate because of the sleeps in the busy polling from assertTrue. Maybe just use a PlainActionFuture for the listener above and then wait for its completion here?
original-brownbear
approved these changes
Sep 9, 2022
Member
Author
|
Thanks, Armin! |
weizijun
added a commit
to weizijun/elasticsearch
that referenced
this pull request
Sep 9, 2022
* main: (176 commits) Fix RandomSamplerAggregatorTests testAggregationSamplingNestedAggsScaled test failure (elastic#89958) [Downsampling] Replace document map with SMILE encoded doc (elastic#89495) Remove full cluster state from error logging in MasterService (elastic#89960) [ML] Truncate categorization fields (elastic#89827) [TSDB] Removed `summary` and `histogram` metric types (elastic#89937) Update testNodeSelectorRouting so that it does not depend on iteration order (elastic#89879) Make sure listener is resolved when file queue is cleared (elastic#89929) [Stable plugin api] Extensible annotation (elastic#89903) Fix double sending of response in TransportOpenIdConnectPrepareAuthenticationAction (elastic#89930) Make sure ivy repo directory exists before downloading artifacts Use 'file://' scheme for local repository URL Use DRA artifacts for release build CI jobs Log unsuccessful attempts to get credentials from web identity tokens (elastic#88241) Script: Write Field API path manipulation (elastic#89889) Fetch health info action (elastic#89820) Fix memory leak in TransportDeleteExpiredDataAction (elastic#89935) [ML] Performance improvements for categorization jobs (elastic#89824) [DOCS] Revert changes for ES_JAVA_OPTS (elastic#89931) Fix deadlock bug exposed by a test (elastic#89934) [Downsampling] Remove `FieldValueFetcher` validator (elastic#89497) ...
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
3 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.
Handle a bug introduced in #88209 while refactoring how file upload tasks run in a shard snapshot. The corner case where the queue of files to snapshot gets cleared when a file snapshot runs into an exception is not addressed in that PR.
Closes #89927
Closes #89956