Skip to content

v3.1: bug: use try_send in handle_forwarded_packets (backport of #10498)#10552

Merged
apfitzge merged 1 commit intov3.1from
mergify/bp/v3.1/pr-10498
Feb 18, 2026
Merged

v3.1: bug: use try_send in handle_forwarded_packets (backport of #10498)#10552
apfitzge merged 1 commit intov3.1from
mergify/bp/v3.1/pr-10498

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify Bot commented Feb 11, 2026

Problem

Summary of Changes

  • Call try_send and drop packets if the channel is at capacity

Fixes #


This is an automatic backport of pull request #10498 done by [Mergify](https://mergify.com).

* bug: use try_send in handle_forwarded_packets

* add fetch_stage-dropped_forwards

(cherry picked from commit 68fcb67)
@mergify mergify Bot requested a review from a team as a code owner February 11, 2026 14:57
@codecov-commenter
Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 64.28571% with 5 lines in your changes missing coverage. Please review.
✅ Project coverage is 83.2%. Comparing base (01a77c7) to head (b36d86d).

Additional details and impacted files
@@            Coverage Diff            @@
##             v3.1   #10552     +/-   ##
=========================================
- Coverage    83.2%    83.2%   -0.1%     
=========================================
  Files         865      865             
  Lines      376601   376612     +11     
=========================================
- Hits       313609   313587     -22     
- Misses      62992    63025     +33     
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copy link
Copy Markdown

@t-nelson t-nelson left a comment

Choose a reason for hiding this comment

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

this pr needs to land before #10551 to avoid introducing a bug on channel full upon switching to bounded channel

Copy link
Copy Markdown

@steviez steviez left a comment

Choose a reason for hiding this comment

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

this pr needs to land before #10551 to avoid introducing a bug on channel full upon switching to bounded channel

Agreed

@apfitzge apfitzge merged commit 2941257 into v3.1 Feb 18, 2026
44 checks passed
@apfitzge apfitzge deleted the mergify/bp/v3.1/pr-10498 branch February 18, 2026 23:02
@KirillLykov
Copy link
Copy Markdown

If we assume that users use released version of 3.1 and not raw branch v3.1 then why not it is enough to ensure that both of these changes land to the same release?

@steviez
Copy link
Copy Markdown

steviez commented Feb 22, 2026

If we assume that users use released version of 3.1 and not raw branch v3.1 then why not it is enough to ensure that both of these changes land to the same release?

Generally, yes, I expect that most people will update to the v3.1.9 tag which means they'll pickup both commits. But, we have no way to guarantee this. Canaries pick up the latest commit from their respective branches, and someone running a git bisect could end up running on one of these intermediate commits.

The point is to be deliberate with how we release upgrades and to remove/minimize the chance of introducing a foot-gun. What is we merged 10551 first because "it should be fine, 10552 coming soon" but then 10552 gets held up because it breaks something else. There is nothing to be gained by assuming that people will pick up both commits, and there is no reason to merge them in the "wrong" order if we know that the "wrong" order creates a bug

@KirillLykov
Copy link
Copy Markdown

If we assume that users use released version of 3.1 and not raw branch v3.1 then why not it is enough to ensure that both of these changes land to the same release?

Generally, yes, I expect that most people will update to the v3.1.9 tag which means they'll pickup both commits. But, we have no way to guarantee this. Canaries pick up the latest commit from their respective branches, and someone running a git bisect could end up running on one of these intermediate commits.

The point is to be deliberate with how we release upgrades and to remove/minimize the chance of introducing a foot-gun. What is we merged 10551 first because "it should be fine, 10552 coming soon" but then 10552 gets held up because it breaks something else. There is nothing to be gained by assuming that people will pick up both commits, and there is no reason to merge them in the "wrong" order if we know that the "wrong" order creates a bug

So in theory, if we are again in such situation and we have commit introducing some bug and after that PR fixing it if nothing has been released and changes are minimal, is the best way to revert original PR and introduce a new one with bug fixed?

@steviez
Copy link
Copy Markdown

steviez commented Feb 24, 2026

So in theory, if we are again in such situation and we have commit introducing some bug and after that PR fixing it if nothing has been released and changes are minimal, is the best way to revert original PR and introduce a new one with bug fixed?

Just making sure - you are asking about the master PR's, not the v3.1 PR's right ? If so, then yes, I think that it is typically preferred to back out the original and then reapply with fix. When we find that commits break something very obviously (CI, canaries, etc), we back it out as soon as the bug is discovered

If a couple weeks pass before the bug is discovered, things can get a little ambiguous if the commit doesn't revert cleanly.

@apfitzge
Copy link
Copy Markdown

^ To add onto @steviez's comment - I did this incorrectly. I think your PR could have been cleanly reverted and fixed. Then backported as a whole.

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.

5 participants