[7.x] [sourcemaps] Support multiple fleet addresses when requesting a sourcemap (backport #5770) #5841
+194
−23
Conversation
This file contains 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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
…emap (#5770) * Send request to multiple fleet servers when fetching sourcemap * Handle case when context is canceled before any results are sent to the results channel * Update sourcemap/fleet_store.go Co-authored-by: Andrew Wilkins <[email protected]> * Combine test for single and multiple fleet servers * Use atomic.AddInt32 to increment shared request counter var * Add test for a mix of successful and failed fleet server sourcemap requests * Simplify test for failed and successful fleet hosts fetch * Context should be first argument * Lock setting shared variable in test * Remove unnecessary called var Co-authored-by: Andrew Wilkins <[email protected]> (cherry picked from commit 212f099) # Conflicts: # sourcemap/fleet_store_test.go
mergify
bot
added
the
conflicts
💔 Build Failed
Expand to view the summary
Build stats
Trends 🧪Steps errors
Expand to view the steps failures
|
|
Need to merge #5843 first |
|
This pull request is now in conflicts. Could you fix it @mergify[bot]? 🙏 |
2 tasks
|
backporting manually |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is an automatic backport of pull request #5770 done by Mergify.
Cherry-pick of 212f099 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.io/