Cleanup worktree defensively #414
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
k8s-ci-robot
added
cncf-cla: yes
nan-yu
approved these changes
Jun 21, 2021
Contributor
nan-yu
left a comment
nan-yu
left a comment
There was a problem hiding this comment.
A minor comment. Otherwise, LGTM
janetkuo
reviewed
Jun 21, 2021
thockin
reviewed
Jun 21, 2021
Member
thockin
left a comment
thockin
left a comment
There was a problem hiding this comment.
Thanks.
As discussed on chat - a small e2e for this would help a lot. This doesn't directly port to v4, and I don't mind adapting it myself, but that test would help :)
barney-s
force-pushed
the
411
branch
2 times, most recently
from
c243c4a to
42903a2
Compare
Author
I tried doing this for the e2e but it passes even without my change. I did Next it tried So i could not write and effective test case. Iam suspecting the container is cleaning up the worktree as part of startup ? |
Member
|
Can you |
Author
|
Without fix, the test case fails: With fix, the testcase passes: |
thockin
reviewed
Jun 22, 2021
Member
thockin
left a comment
thockin
left a comment
There was a problem hiding this comment.
Thanks for the test case. Can you try to minimize the sleeps?
I agree with @nan-yu comment (https://github.com/kubernetes/git-sync/pull/414/files#r655741357) - just a short change to the comment there.
Other than that, LGTM
janetkuo
reviewed
Jun 22, 2021
nan-yu
reviewed
Jun 22, 2021
Author
Reduced sleep. Addressed @nan-yu 's comment. |
This is to avoid wedge cases where the worktree was created but this function error'd without cleaning the worktree. Next timearound, the sync loop fails to create the worktree and bails out. We observed a case where due to kubernetes#412, the next sync loop failed with this error: " Run(git worktree add /repo/root/rev-nnnn origin/develop): exit status 128: { stdout: \"Preparing worktree (detached HEAD nnnn)\\n\", stderr: \"fatal: '/repo/root/rev-nnnn' already exists\\n\" }"
janetkuo
approved these changes
Jun 22, 2021
k8s-ci-robot
added
the
lgtm
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: barney-s, janetkuo, nan-yu, thockin The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
approved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
This is to avoid wedge cases where the worktree was created but this function error'd without cleaning the worktree.
Next timearound, the sync loop fails to create the worktree and bails out.
We observed a case where due to #412, the next sync loop failed with this error:
" Run(git worktree add /repo/root/rev-nnnn origin/develop): exit status 128: { stdout: "Preparing worktree (detached HEAD nnnn)\n", stderr: "fatal: '/repo/root/rev-nnnn' already exists\n" }"
Fixes #411