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 [3.7] #17302

Merged

Conversation

sjenning
Copy link
Contributor

@sjenning sjenning commented Nov 14, 2017

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.

@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
@derekwaynecarr
Copy link
Member

/approve
/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 14, 2017
@derekwaynecarr derekwaynecarr changed the title UPSTREAM: 55641: dockershim: remove corrupt checkpoints immediately upon detection UPSTREAM: 55641: dockershim: remove corrupt checkpoints immediately upon detection [3.7] Nov 14, 2017
@openshift-merge-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: derekwaynecarr, sjenning

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

@openshift-merge-robot openshift-merge-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. vendor-update Touching vendor dir or related files labels Nov 14, 2017
@openshift-merge-robot openshift-merge-robot removed the lgtm Indicates that a PR is ready to be merged. label Nov 14, 2017
@sjenning
Copy link
Contributor Author

/test unit

@sjenning
Copy link
Contributor Author

/retest

@eparis
Copy link
Member

eparis commented Nov 15, 2017

/retest
is something actually broken?>!?!!?!?!?!

@sjenning
Copy link
Contributor Author

[openshift/origin-gitserver] --> ENTRYPOINT ["/usr/bin/gitserver"]
[openshift/origin-gitserver] --> Committing changes to openshift/origin-gitserver:99058e3 ...
[openshift/origin-gitserver] unable to commit build container: API error (500): {"message":"devmapper: Error mounting '/dev/mapper/docker-202:2-92453254-6c7218b13a4cdc3756e014ae90ee434ebc9bc5ea28d75f9af008b80be955f702' on '/var/lib/docker/devicemapper/mnt/6c7218b13a4cdc3756e014ae90ee434ebc9bc5ea28d75f9af008b80be955f702': invalid argument"}
[openshift/origin-gitserver] Removing examples/gitserver/bin/gitserver
[WARNING] Retrying image build for openshift/origin-gitserver:latest, attempt 1...
[openshift/origin-gitserver] --> FROM openshift/origin
[openshift/origin-gitserver] --> COPY bin/gitserver /usr/bin/gitserver
[openshift/origin-gitserver] stat examples/gitserver/bin/gitserver: no such file or directory
[ERROR] PID 19479: hack/build-images.sh:56: `return "${result}"` exited with status 1.
[INFO] 		Stack Trace: 
[INFO] 		  1: hack/build-images.sh:56: `return "${result}"`
[INFO]   Exiting with code 1.

Seems to be a flake making the origin-gitserver image. Not the same failure as before.
/retest

@sjenning
Copy link
Contributor Author

sjenning commented Nov 29, 2017

@eparis can I get approval here? had lgtm from derek but had to change something and lost it.

@eparis
Copy link
Member

eparis commented Nov 29, 2017

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: derekwaynecarr, eparis, openshift-merge-robot, sjenning

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

@sjenning
Copy link
Contributor Author

/retest

1 similar comment
@sjenning
Copy link
Contributor Author

/retest

@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 30, 2017

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

Test name Commit Details Rerun command
ci/openshift-jenkins/extended_conformance_install_update 69074b8 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.

@openshift-merge-robot openshift-merge-robot merged commit d1e9479 into openshift:release-3.7 Nov 30, 2017
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.

5 participants