Repository navigation
fix(net): preserve cancellation errors during partitioned downloads - #3090
Merged
Merged
Conversation
- Return the original acquisition error after downloader cleanup instead of a close-normalized result. - Start workers only after queueing their chunk so concurrency slots have one owner. - Cover cancelled acquisition, slot release, and the public proxy panic. Co-authored-by: Codex <267193182+codex@users.noreply.github.com>
nostalume
marked this pull request as ready for review
September 19, 2026 11:24
This was referenced Sep 19, 2026
pikachuren
reviewed
Sep 21, 2026
pikachuren
left a comment
Collaborator
There was a problem hiding this comment.
🙏 感谢 @nostalume 提交!
🤖 AI 自动审核声明:本评审报告由 AI 自动生成,当前使用 Claude Opus 5 模型进行分析。
🎯 结论
✅ Approve — 代码质量良好,建议合并
📖 概要
fix(net): preserve cancellation errors during partitioned downloads
📊 评审结果
改动合理,无重大问题发现。代码逻辑清晰,符合项目规范。
🎯 结论:✅ Approve — 建议合并
jyxjjj
approved these changes
Sep 23, 2026
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
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.
Summary / 摘要
Fix a partitioned-download cancellation path that could return a nil reader with a nil error and then panic while serving a proxy request. Preserve the acquisition error after cleanup; start a worker only after its first chunk is queued, so a cancelled queue attempt cannot release its concurrency slot twice.
The change is independent of the now-closed #3089 and does not alter configuration, storage format, or public API. The tests cover the downloader's single-part cancellation/upstream failure, multi-part cancellation and concurrency-slot ownership, and the public proxy panic. Already-written HTTP response status is intentionally not remapped in this PR.
/ 此 PR 包含破坏性变更。
/ 此 PR 修改了公开 API、配置、存储格式或迁移行为。
/ 此 PR 需要关联仓库同步修改。
Related repository PRs / 关联仓库 PR:
Testing / 测试
go test ./...(not run)go test ./internal/net -run '^(TestDownload|TestHighConcurrency)' -count=1on Windows/amd64, Go 1.27.1go test ./server/common -count=1on Windows/amd64, Go 1.27.1go vet ./internal/net ./server/commonon Windows/amd64, Go 1.27.1CGO_ENABLED=1 go test -race ./internal/net ./server/common -run '^(TestDownloadCancelledAcquisitionReturnsErrorAndReleasesLimit|TestDownloadSinglePartFailureReleasesLimit|TestProxyCancelledPartitionedReaderDoesNotPanic)$' -count=3on Linux/amd64 (WSL), Go 1.27.1Known unrelated baseline failures, reproduced on the unmodified main-based worktree: the full Windows
go test ./internal/netfailsTestNewOSSClientUsesEnvironmentHTTPSProxy(*net.safeTransportversus expected*http.Transport); Linux-raceon existingTestHighConcurrencyreports aHybridCache.BufferStore.WriteAt/GrowTorace. Neither is addressed in this PR.Checklist / 检查清单
/ 我已阅读 CONTRIBUTING。
/ 待人工协作者确认。
gofmt./ 已格式化变更代码。
/ 已请求相关维护者或代码所有者审查。
AI Disclosure / AI 使用声明
/ 此 PR 包含 AI 辅助内容。
Tools used / 使用工具:
Usage scope / 使用范围:
Code generation / 代码生成
Tests / 测试
Review assistance / 审查辅助
I have reviewed and validated all AI-assisted content included in this PR. (Pending human collaborator review.)
I have ensured that all AI-assisted commits include
Co-authored-byattribution.I can reproduce all AI-assisted content included in this PR without any AI tools. (Pending human collaborator confirmation.)