Repository navigation
🌱 chore: remove unreachable MITM cancellation guard - #15345
Conversation
Requests parsed by http.ReadRequest have no cancellation context attached in the MITM path, so this guard cannot fire. Retain caller-cancellation handling in the HTTP translator handler. Hive-Run: #15089 Hive-Plan: MITM cancellation dead-code cleanup Hive-Spec: #15089#unreachable-mitm-guard Signed-off-by: thatguywob <thatguywob@users.noreply.github.com>
The guard exhausted its ten-minute job budget while the optional Bob CLI download was retrying, before reaching its containerd assertions. Match the existing docker job budget because both build the full src/Dockerfile image. Hive-Run: #15089 Hive-Plan: MITM cancellation dead-code cleanup Hive-Spec: #15089#unreachable-mitm-guard Signed-off-by: thatguywob <thatguywob@users.noreply.github.com>
Drop the unrelated overlayfs CI timeout increase as requested by maintainers. Retain only the unreachable MITM cancellation guard removal and its changelog fragment in the PR diff. Hive-Run: #15089 Hive-Plan: MITM cancellation dead-code cleanup Hive-Spec: #15089#unreachable-mitm-guard Signed-off-by: thatguywob <thatguywob@users.noreply.github.com>
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Open PR overlap checkBase branch: Conflicts are checked with every PR merged onto the current tip of
|
There was a problem hiding this comment.
Looks correct to me — the removed branch is unreachable, as the body says.
Evidence (read at v5 HEAD and the PR head 8438229):
src/crux/proxy/github_proxy_inference.go:623—reqis produced byhttp.ReadRequest(clientBuf), which never attaches a context, soreq.Context()iscontext.Background()andreq.Context().Err()is alwaysnil. Theerrors.Is(req.Context().Err(), context.Canceled)half of the removed condition at:687could never be true.src/crux/proxy/github_proxy_inference.go:448— the HTTP-translator handler builds its upstream request fromr.Context()(anet/httpserver context), so its cancellation guard is reachable and is correctly left alone.- Everything else in the error path (
RecordEndpointError,recordAgentInferenceError,writeHTTPError) is unchanged; the diff is a pure dead-code removal plus achanged-changelog fragment.
Two notes for whoever merges:
- This head is byte-identical to #15159 (same SHA
8438229dd6ec). Only one of the two should land; since this branch is the one the hive can push to, #15159 is the one to close once this merges. I have not closed anything. - The adoption body says CI had gone red on the original, but on this head every check is green (
test,coverage,golangci-lint,changelog-fragment-guard, DCO; only the arm64buildwas still in progress when I looked). No fix-agent rebase appears to be needed.
— hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88
|
Thank you for your contribution! Your PR has been merged. We'd love to hear how your experience was: share feedback |
Supersedes #15159 (adopted after CI went red and the contributor was unavailable; original commits by @thatguywob preserved).
Fixes #15089
This branch is #15159's head
8438229dd6ecas pushed by @thatguywob (forkthatguywob/hive), unchanged. Last lane reason on the original:contributor-lane:changes-requested.Hive fix agent: rebase this branch on
v5, fix the failing checks / review asks, and push to THIS branch. Keep the original author's commits and theirSigned-off-by; add your own sign-off on your commits. Do not open another PR.