fix(api): send to closed channel in mergeLogStreams (#7006)#21178
Merged
crenshaw-dev merged 5 commits intoargoproj:masterfrom Dec 16, 2024
Merged
fix(api): send to closed channel in mergeLogStreams (#7006)#21178crenshaw-dev merged 5 commits intoargoproj:masterfrom
crenshaw-dev merged 5 commits intoargoproj:masterfrom
Conversation
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
❌ Preview Environment deleted from BunnyshellAvailable commands (reply to this comment):
|
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #21178 +/- ##
=========================================
Coverage ? 55.24%
=========================================
Files ? 324
Lines ? 55659
Branches ? 0
=========================================
Hits ? 30749
Misses ? 22287
Partials ? 2623 ☔ View full report in Codecov by Sentry. |
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Member
Author
|
/cherry-pick release-2.13 |
Member
Author
|
/cherry-pick release-2.12 |
gcp-cherry-pick-bot bot
pushed a commit
that referenced
this pull request
Dec 16, 2024
* fix(api): send to closed channel in mergeLogStreams (#7006) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * more intense test Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * even more intense Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * remove unnecessary comment Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * fix the race condition Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Member
Author
|
/cherry-pick release-2.11 |
gcp-cherry-pick-bot bot
pushed a commit
that referenced
this pull request
Dec 16, 2024
* fix(api): send to closed channel in mergeLogStreams (#7006) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * more intense test Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * even more intense Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * remove unnecessary comment Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * fix the race condition Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
|
Cherry-pick failed with |
crenshaw-dev
added a commit
that referenced
this pull request
Dec 16, 2024
…21187) * fix(api): send to closed channel in mergeLogStreams (#7006) * more intense test * even more intense * remove unnecessary comment * fix the race condition --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
crenshaw-dev
added a commit
that referenced
this pull request
Dec 16, 2024
…21188) * fix(api): send to closed channel in mergeLogStreams (#7006) * more intense test * even more intense * remove unnecessary comment * fix the race condition --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
dudo
pushed a commit
to dudo/argo-cd
that referenced
this pull request
Jan 18, 2025
…rgoproj#21178) * fix(api): send to closed channel in mergeLogStreams (argoproj#7006) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * more intense test Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * even more intense Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * remove unnecessary comment Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * fix the race condition Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> Signed-off-by: Brett C. Dudo <brett@dudo.io>
revitalbarletz
pushed a commit
to revitalbarletz/argo-cd
that referenced
this pull request
Jan 20, 2025
…rgoproj#21178) * fix(api): send to closed channel in mergeLogStreams (argoproj#7006) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * more intense test Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * even more intense Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * remove unnecessary comment Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * fix the race condition Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
vasilegroza
pushed a commit
to vasilegroza/argo-cd
that referenced
this pull request
Feb 27, 2025
…rgoproj#21178) * fix(api): send to closed channel in mergeLogStreams (argoproj#7006) Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * more intense test Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * even more intense Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * remove unnecessary comment Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> * fix the race condition Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com> --------- Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
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
2 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.
Fixes #7006
The test reproduces the issue in GitHub.