-
Notifications
You must be signed in to change notification settings - Fork 4.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
UPSTREAM: 55641: dockershim: remove corrupt checkpoints immediately upon detection #17299
Conversation
@sjenning -- this needs to be against release-3.7 and not master. |
We need both, right? |
@eparis @derekwaynecarr from the meeting we just had, should I reopen this but hold it so it doesn't interfere with rebase? |
/retest |
re-opened to make sure we don't lose the 3.8/3.9 pick. |
/assign @soltysh |
/lgtm |
removing lgtm as upstream merges to master are on hold... please tag this when the rebase lands. |
/retest |
seth, can we get one for 3.7 as well? |
re-added lgtm as the PR has a hold and won't merge until it is removed. The mast team agreed to 'forward pick' anything to origin/master that goes to 3.7, so this is just waiting for them to remove the hold. |
@sjenning now that the rebase landed this is good to go, just need a reabse ;) |
/hold cancel |
@sjenning looks like you're still missing some bits, or it needs to be updated to match current level of k8s. |
/retest |
/lgtm |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: eparis, sjenning, soltysh The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these OWNERS Files:
You can indicate your approval by writing |
/hold This will conflict with #17477 and that pull is on the path to branching 3.8 and starting the 1.9 rebase. Said pull is in queue. |
/hold cancel |
/test all [submit-queue is verifying that this PR is safe to merge] |
flake #17472 /retest |
@sjenning: The following tests failed, say
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
Automatic merge from submit-queue (batch tested with PRs 17299, 17482, 17471). |
Automatic merge from submit-queue. UPSTREAM: 55641: dockershim: remove corrupt checkpoints immediately upon detection [3.7] master PR #17299 kubernetes/kubernetes#55641 xref https://bugzilla.redhat.com/show_bug.cgi?id=1512717 @derekwaynecarr @eparis @jupierce Diverges from upstream in `checkpoint_store.go`, since that file no longer exists upstream. The checkpoint code was migrated to pkg/kubelet/util in kubernetes/kubernetes#54085. Also, I don't remove the `dockershim/errors` package as was done in upstream because the `checkpoint_store.go` uses it. This reduces the footprint of the change.
kubernetes/kubernetes#55641
xref https://bugzilla.redhat.com/show_bug.cgi?id=1512717
@derekwaynecarr @eparis @jupierce
Diverges from upstream in
checkpoint_store.go
, since that file no longer exists upstream. The checkpoint code was migrated topkg/kubelet/util
in kubernetes/kubernetes#54085