fix: isolate REST timeout middleware handler context#49982
Merged
sre-ci-robot merged 1 commit intoMay 22, 2026
Conversation
Related to milvus-io#49981 The REST timeout middleware could return a timeout response while the handler goroutine continued using the original Gin context. Once Gin recycled that context, late handler writes could race with a later request and trigger concurrent map writes. Run timeout-wrapped handlers with a copied Gin context and a fully buffered response recorder instead. The original context and real response writer now remain owned by the middleware goroutine, while normal completion explicitly propagates selected metadata and commits the recorder. Timeout closes the recorder and writes the 408 response through the real writer, so late handler writes are discarded safely. Add tests for recorder isolation, normal buffered commits, metadata and abort propagation, late writes after timeout, and race validation of the late-write timeout path. Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: congqixia The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
mergify
Bot
added
dco-passed
Contributor
|
[ci-v2-notice] To rerun ci-v2 checks, comment with:
If you have any questions or requests, please contact @zhikunyao. |
Contributor
✅ CI Loop Results
|
| Stage | Result | Duration | Tests |
|---|---|---|---|
| ✅ Build | SUCCESS | 12.9min | - |
| ✅ Code-Check | SUCCESS | 4.8min | - |
| ✅ UT-GO | SUCCESS | 15.1min | 1012 passed |
| ✅ UT-Integration | SUCCESS | 23.7min | 46 passed |
| ✅ UT-CPP-Cov | SUCCESS | 52.4min | 7725 passed |
Total: 69min | Pipeline | Artifacts
Overall Coverage: 67.4%
Diff Coverage: Go 72.1% (101 hit, 39 miss, 140 measurable lines)
Total Patch Coverage: 72.1% (101/140 measurable lines)
Contributor
|
/lgtm |
Codecov Report❌ Patch coverage is
❌ Your patch status has failed because the patch coverage (79.48%) is below the target coverage (80.00%). You can increase the patch coverage or adjust the target coverage. Additional details and impacted files@@ Coverage Diff @@
## master #49982 +/- ##
==========================================
- Coverage 78.55% 78.51% -0.05%
==========================================
Files 2209 2209
Lines 383180 383231 +51
==========================================
- Hits 301012 300891 -121
- Misses 73039 73188 +149
- Partials 9129 9152 +23
🚀 New features to boost your workflow:
|
sre-ci-robot
added
the
low-code-coverage
sre-ci-robot
pushed a commit
that referenced
this pull request
May 21, 2026
Cherry-pick from master pr: #49982 Related to #49981 The REST timeout middleware could return a timeout response while the handler goroutine continued using the original Gin context. Once Gin recycled that context, late handler writes could race with a later request and trigger concurrent map writes. Run timeout-wrapped handlers with a copied Gin context and a fully buffered response recorder instead. The original context and real response writer now remain owned by the middleware goroutine, while normal completion explicitly propagates selected metadata and commits the recorder. Timeout closes the recorder and writes the 408 response through the real writer, so late handler writes are discarded safely. Add tests for recorder isolation, normal buffered commits, metadata and abort propagation, late writes after timeout, and race validation of the late-write timeout path. Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
Contributor
Author
|
/ci-rerun-e2e-default |
1 similar comment
Contributor
Author
|
/ci-rerun-e2e-default |
congqixia
added a commit
to congqixia/milvus
that referenced
this pull request
May 25, 2026
Related to milvus-io#49981 The REST timeout middleware could return a timeout response while the handler goroutine continued using the original Gin context. Once Gin recycled that context, late handler writes could race with a later request and trigger concurrent map writes. Run timeout-wrapped handlers with a copied Gin context and a fully buffered response recorder instead. The original context and real response writer now remain owned by the middleware goroutine, while normal completion explicitly propagates selected metadata and commits the recorder. Timeout closes the recorder and writes the 408 response through the real writer, so late handler writes are discarded safely. Add tests for recorder isolation, normal buffered commits, metadata and abort propagation, late writes after timeout, and race validation of the late-write timeout path. Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
sre-ci-robot
pushed a commit
that referenced
this pull request
May 25, 2026
…50006) Cherry-pick from master pr: #49982 Related to #49981 The REST timeout middleware could return a timeout response while the handler goroutine continued using the original Gin context. Once Gin recycled that context, late handler writes could race with a later request and trigger concurrent map writes. Run timeout-wrapped handlers with a copied Gin context and a fully buffered response recorder instead. The original context and real response writer now remain owned by the middleware goroutine, while normal completion explicitly propagates selected metadata and commits the recorder. Timeout closes the recorder and writes the 408 response through the real writer, so late handler writes are discarded safely. Add tests for recorder isolation, normal buffered commits, metadata and abort propagation, late writes after timeout, and race validation of the late-write timeout path. Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
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
3 participants
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.
Related to #49981
The REST timeout middleware could return a timeout response while the handler goroutine continued using the original Gin context. Once Gin recycled that context, late handler writes could race with a later request and trigger concurrent map writes.
Run timeout-wrapped handlers with a copied Gin context and a fully buffered response recorder instead. The original context and real response writer now remain owned by the middleware goroutine, while normal completion explicitly propagates selected metadata and commits the recorder. Timeout closes the recorder and writes the 408 response through the real writer, so late handler writes are discarded safely.
Add tests for recorder isolation, normal buffered commits, metadata and abort propagation, late writes after timeout, and race validation of the late-write timeout path.