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: prevent crash during timer expiration after stream is closed #19917

Merged
merged 1 commit into from
Sep 17, 2024

Conversation

morapet
Copy link
Contributor

@morapet morapet commented Sep 12, 2024

Reorder ticker stop and close merge to prevent send(true) happens after merge is closed, in rare situation when the timer expires exactly at the point between close(merge) and ticker.Stop()

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • The title of the PR conforms to the Toolchain Guide
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates? No
  • I've updated documentation as required by this PR.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.
  • Optional. My organization is added to USERS.md.
  • Optional. For bug fixes, I've indicated what older releases this fix should be cherry-picked into (this may or may not happen depending on risk/complexity).

This is a bug
Closes #7006

@morapet morapet requested a review from a team as a code owner September 12, 2024 17:11
Copy link

bunnyshell bot commented Sep 12, 2024

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

Copy link

bunnyshell bot commented Sep 12, 2024

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

@morapet morapet changed the title Prevent crash during timer expiration after stream is closed fix: prevent crash during timer expiration after stream is closed Sep 12, 2024
Copy link

codecov bot commented Sep 12, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 55.83%. Comparing base (e67a7b6) to head (ab221c3).
Report is 25 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #19917      +/-   ##
==========================================
- Coverage   55.83%   55.83%   -0.01%     
==========================================
  Files         320      320              
  Lines       44381    44381              
==========================================
- Hits        24782    24781       -1     
- Misses      17030    17041      +11     
+ Partials     2569     2559      -10     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@nitishfy nitishfy left a comment

Choose a reason for hiding this comment

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

Please resolve the Lint Issues for this PR by running the gofumpt command against the logs.go. Thanks!

@morapet morapet force-pushed the fix-logs-panic branch 2 times, most recently from a02d12c to ae78498 Compare September 16, 2024 07:39
Reorder ticker stop and close merge to prevent send(true) happens after merge is closed, in rare situation when the timer expires exactly at the point between close(merge) and ticker.Stop()

Signed-off-by: morapet <[email protected]>
Copy link
Member

@gdsoumya gdsoumya left a comment

Choose a reason for hiding this comment

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

LGTM

@gdsoumya gdsoumya merged commit bcc224b into argoproj:master Sep 17, 2024
27 of 28 checks passed
@crenshaw-dev
Copy link
Member

/cherry-pick release-2.13

1 similar comment
@agaudreault
Copy link
Member

/cherry-pick release-2.13

@agaudreault
Copy link
Member

last try! I'll do it manually :(

agaudreault pushed a commit to agaudreault/argo-cd that referenced this pull request Oct 7, 2024
…j#19917)

Reorder ticker stop and close merge to prevent send(true) happens after merge is closed, in rare situation when the timer expires exactly at the point between close(merge) and ticker.Stop()

Signed-off-by: morapet <[email protected]>
agaudreault pushed a commit to agaudreault/argo-cd that referenced this pull request Oct 7, 2024
…j#19917)

Reorder ticker stop and close merge to prevent send(true) happens after merge is closed, in rare situation when the timer expires exactly at the point between close(merge) and ticker.Stop()

Signed-off-by: morapet <[email protected]>
crenshaw-dev pushed a commit that referenced this pull request Oct 7, 2024
…#20272)

Reorder ticker stop and close merge to prevent send(true) happens after merge is closed, in rare situation when the timer expires exactly at the point between close(merge) and ticker.Stop()

Signed-off-by: morapet <[email protected]>
Co-authored-by: morapet <[email protected]>
crenshaw-dev pushed a commit that referenced this pull request Oct 7, 2024
…9917) (#20271)

Reorder ticker stop and close merge to prevent send(true) happens after merge is closed, in rare situation when the timer expires exactly at the point between close(merge) and ticker.Stop()

Signed-off-by: morapet <[email protected]>
Co-authored-by: morapet <[email protected]>
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.
5 participants