Repository navigation
git: report a FETCH timeout as TIMEOUT and kill what git started - #138
Merged
Merged
Conversation
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.
When a FETCH hits its
timeout_ms, two things go wrong:Internal, notTimeout.run_gitreturnsGIT_STATUS_OTHERat the deadline, so a client can't tell a stalled remote from a server bug.run_gitkills only thegitprocess. The ssh session, credential helper or local upload-pack under it is orphaned and runs until it finishes or blocks forever. With a remote whose upload-pack issleep 30; git-upload-packandtimeout_ms: 500, the call returns after 0.5 s and thesleepsurvives.Changes:
GIT_STATUS_TIMEOUTmaps throughnative::Status::Timeoutto the wire'sTimeout.run_gitstarts git in its own process group. On timeout or cancellation,kill_gitsends SIGKILL to the whole group, then kills and reaps git as before. This needslibcon Unix and oneunsafecall, which UNSAFE.md now covers. On Windows only git itself is killed, as before.fetch_timeout_reports_timeout_and_kills_what_git_started(Unix) pointsremote.origin.uploadpackat a shell that records its pid and sleeps. It expectsStatus::Timeoutand checks that the shell is gone within 5 s. It fails withOtherbefore this change. With the status fix but without the group kill, it fails withupload-pack … outlived the fetch.Found by fuzzing FETCH over a native session.
cargo test -p yas-git --test engine,cargo test -p yas-server --lib git,cargo clippy -p yas-git -p yas-server --all-targets -- -D warningsandcargo fmt --checkpass.Tag
@indentto continue the conversation here.