Skip to content

fix(net): queue a prefix retracted again at one clock reading once - #5391

Merged
kixelated merged 2 commits into
mainfrom
fix/retract-quarantine-churn
Oct 13, 2026
Merged

kixelated merged 2 commits into
mainfrom
fix/retract-quarantine-churn

Conversation

@kixelated

@kixelated kixelated commented Oct 13, 2026 •

Copy link
Copy Markdown
Collaborator

Problem

#5375's retraction quarantine queues each retraction until the next clock reading. A delivered announcement removed the quarantine but left its queue entry, so retract and announce cycles before the clock moved each added one. A cursor that never went pending (synchronously drained, or always ready) grew the queue with route churn instead of with prefixes. Found by Codex on the release backport, #5376.

Approach

  • A delivered announcement leaves the quarantine to expire instead of removing it: later announcements for the prefix are updates, which a quarantine never holds.
  • A retraction at the same reading as the prefix's queued one skips the queue.
  • An anonymous retraction keeps a quarantine with no publisher, which holds nothing but still marks the prefix as queued. Removing it instead let a named retraction after it queue again (OpenAI review on backport: hold back a stale path to a prefix a cursor just retracted (#5375) #5376).

a_retraction_quarantines_a_named_publisher now cycles one prefix four times at one reading, alternating named and anonymous routes, and asserts a single queue entry for it.

Impact

  • None to the API or wire.

Alternatives

  • Compact the queue when it outgrows the map: still keeps duplicate entries for one prefix at one reading.

Follow-ups

Checks

  • just check passes (6156 tests).

🤖 Generated with Claude Code

(Written by Claude Opus 5.5)


View with [code]smith Autofix with [code]smith
Need help on this PR? Tag @codesmith-bot with what you need.

kixelated and others added 2 commits October 12, 2026 21:03
Retract and announce cycles between clock readings each queued an anchoring
entry, so a cursor that never went pending grew the queue with churn instead of
prefixes. A delivered announcement now leaves the quarantine to expire, since
later announcements are updates it never holds, and a retraction at the same
reading skips the queue.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
An anonymous retraction removed the prefix's quarantine, so a named retraction
after it at the same reading queued again. Keep the entry with no publisher
instead, which holds nothing but still marks the prefix as queued.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 13, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-13T04:38:58.636883Z 61c7ac2 Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@coderabbitai

coderabbitai Bot commented Oct 13, 2026

Copy link
Copy Markdown
Contributor

Warning

Review limit reached

You've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository.

Next included review available in 15 seconds.

Check out review usage here.

View limit details

Limit details: You’ve used all 4 included reviews currently available.

Learn how review limits work.

Review configuration:

⚙️ Run configuration
  • Configuration used: Organization UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: a1684fb0-d504-489a-bd4d-50905114a47d
📥 Commits

Reviewing files that changed from the base of the PR and between 6a988ac and 61c7ac2.

📒 Files selected for processing (1)
  • rs/moq-net/src/model/origin.rs
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@kixelated kixelated left a comment

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Automated review by review (OpenAI)

Reviewed commit: 61c7ac2

No actionable findings in the full one-file diff. The same-reading queue deduplication now survives alternating named/anonymous retractions, addressing the remaining issue identified in #5376. Publisher-less markers hold no routes, and the regression test covers that alternating sequence and eventual quarantine cleanup.

Direction: focused fix that reuses existing per-prefix state without introducing queue scans or changing the API/wire format.

Verification: static review of the patch and surrounding announcement/coalescing, quarantine, and timer paths. Tests and benchmarks were not run; the reported just check result was not independently reproduced.

@kixelated
kixelated enabled auto-merge October 13, 2026 04:39
@kixelated
kixelated added this pull request to the merge queue Oct 13, 2026
Merged via the queue into main with commit 0f4f81f Oct 13, 2026
7 checks passed
@kixelated
kixelated deleted the fix/retract-quarantine-churn branch October 13, 2026 05:14
kixelated added a commit that referenced this pull request Oct 13, 2026
Backport the anonymous-marker fix from #5391 (61c7ac2), adapted to the release AnnounceUpdate API. Preserve deduplication across mixed named and anonymous retractions at one clock reading.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Co-Authored-By: GPT-6 <noreply@openai.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.

1 participant