Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(api): send to closed channel in mergeLogStreams (#7006) #21178

Merged
merged 5 commits into from
Dec 16, 2024

Conversation

crenshaw-dev
Copy link
Member

@crenshaw-dev crenshaw-dev commented Dec 14, 2024

Fixes #7006

The test reproduces the issue in GitHub.

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Copy link

bunnyshell bot commented Dec 14, 2024

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Copy link

codecov bot commented Dec 14, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (master@030a7be). Learn more about missing BASE report.
Report is 5 commits behind head on master.

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.
📢 Have feedback on the report? Share it here.

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>
@crenshaw-dev crenshaw-dev marked this pull request as ready for review December 14, 2024 20:25
@crenshaw-dev crenshaw-dev requested a review from a team as a code owner December 14, 2024 20:25
Copy link
Member

@agaudreault agaudreault left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@crenshaw-dev crenshaw-dev merged commit 4471603 into argoproj:master Dec 16, 2024
28 checks passed
@crenshaw-dev
Copy link
Member Author

/cherry-pick release-2.13

@crenshaw-dev
Copy link
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>
@crenshaw-dev
Copy link
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>
Copy link

Cherry-pick failed with Merge error 4471603de2a8f3e7e0bdfbd9d487468b6b20a354 into temp-cherry-pick-392780-release-2.11

@crenshaw-dev crenshaw-dev deleted the fix-logs-race branch December 16, 2024 00:45
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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Argo-server panics unexpectly while logging.
2 participants