fix(patch): stop a workdir cleanup race from masking update errors#9798
Open
manzoorwanijk wants to merge 1 commit into
Open
fix(patch): stop a workdir cleanup race from masking update errors#9798manzoorwanijk wants to merge 1 commit into
manzoorwanijk wants to merge 1 commit into
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.
npm patch updatebuilds a throwaway git repo in a temp dir to rebase the existing patch, then removes it. Two problems made that removal flaky:Since git 2.48,
maintenance.autoDetachdefaults to true, sogit commitdetachesgit maintenance run --autoand returns while that background process is still writing under.git/objects/pack. Removing the workdir then races it and fails withENOTEMPTY.Both cleanup sites removed the workdir with an unguarded
await rm(...), so that failure replaced the command's real error, aEPATCHBASErebase failure surfaced asENOTEMPTY, and on the success path a cleanup failure would have failed an otherwise-complete update.The throwaway repo's git invocations now pass
-c gc.auto=0 -c maintenance.auto=falseso git never spawns background maintenance, and both cleanup sites go through a helper that retries the removal and never throws.References
Reported in #9793 (comment) as an unrelated CI failure.