Skip to content
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

Merged
merged 1 commit into from Nov 28, 2017

Conversation

sjenning
Copy link
Contributor

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

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 14, 2017
@openshift-merge-robot openshift-merge-robot added the vendor-update Touching vendor dir or related files label Nov 14, 2017
@derekwaynecarr
Copy link
Member

@sjenning -- this needs to be against release-3.7 and not master.

@eparis
Copy link
Member

eparis commented Nov 14, 2017

We need both, right?

@sjenning sjenning closed this Nov 14, 2017
@sjenning
Copy link
Contributor Author

@eparis @derekwaynecarr from the meeting we just had, should I reopen this but hold it so it doesn't interfere with rebase?

@eparis eparis reopened this Nov 14, 2017
@eparis
Copy link
Member

eparis commented Nov 14, 2017

/retest

@eparis
Copy link
Member

eparis commented Nov 14, 2017

re-opened to make sure we don't lose the 3.8/3.9 pick.

@eparis
Copy link
Member

eparis commented Nov 14, 2017

/assign @soltysh
To be merged after 1.8 rebase.

@eparis
Copy link
Member

eparis commented Nov 14, 2017

/lgtm
/hold

@openshift-ci-robot openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Nov 14, 2017
@openshift-merge-robot openshift-merge-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 14, 2017
@mfojtik mfojtik removed the lgtm Indicates that a PR is ready to be merged. label Nov 15, 2017
@mfojtik
Copy link
Member

mfojtik commented Nov 15, 2017

removing lgtm as upstream merges to master are on hold... please tag this when the rebase lands.

@eparis
Copy link
Member

eparis commented Nov 15, 2017

/retest
/lgtm
/hold

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 15, 2017
@eparis
Copy link
Member

eparis commented Nov 15, 2017

seth, can we get one for 3.7 as well?

@eparis
Copy link
Member

eparis commented Nov 15, 2017

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
Copy link
Contributor Author

@eparis #17302

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 20, 2017
@soltysh
Copy link
Member

soltysh commented Nov 21, 2017

@sjenning now that the rebase landed this is good to go, just need a reabse ;)

@soltysh
Copy link
Member

soltysh commented Nov 21, 2017

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 21, 2017
@openshift-merge-robot openshift-merge-robot removed lgtm Indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Nov 21, 2017
@soltysh
Copy link
Member

soltysh commented Nov 23, 2017

@sjenning looks like you're still missing some bits, or it needs to be updated to match current level of k8s.

@sjenning
Copy link
Contributor Author

/retest

@soltysh
Copy link
Member

soltysh commented Nov 28, 2017

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 28, 2017
@openshift-merge-robot
Copy link
Contributor

[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 /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@deads2k
Copy link
Contributor

deads2k commented Nov 28, 2017

/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.

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 28, 2017
@deads2k
Copy link
Contributor

deads2k commented Nov 28, 2017

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 28, 2017
@openshift-merge-robot
Copy link
Contributor

/test all [submit-queue is verifying that this PR is safe to merge]

@sjenning
Copy link
Contributor Author

flake #17472

/retest

@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 28, 2017

@sjenning: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/openshift-jenkins/extended_conformance_gce 7c46f7a link /test extended_conformance_gce
ci/openshift-jenkins/extended_conformance_install_update 7c46f7a link /test extended_conformance_install_update

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.

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue (batch tested with PRs 17299, 17482, 17471).

@openshift-merge-robot openshift-merge-robot merged commit d15f4cc into openshift:master Nov 28, 2017
openshift-merge-robot added a commit that referenced this pull request Nov 30, 2017
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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. vendor-update Touching vendor dir or related files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants