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: 47850: fix for bz1507257 hacked from upstream PR47850 #17097

Merged
merged 1 commit into from
Nov 1, 2017

Conversation

rajatchopra
Copy link
Contributor

'drop' these changes in favour of upstream PR47850 because this one does not carry the entire dependent chain. Conflicts were removed manually.

Original commit comments by @dcbw:
dockershim: checkpoint HostNetwork property

To ensure kubelet doesn't attempt network teardown on HostNetwork
containers that no longer exist but are still checkpointed, make
sure we preserve the HostNetwork property in checkpoints. If
the checkpoint indicates the container was a HostNetwork one,
don't tear down the network since that would fail anyway.

Related: kubernetes/kubernetes#44307 (comment)

…these changes in favour of that PR because this one does not carry the entire dependent chain. Conflicts were removed manually.

dockershim: checkpoint HostNetwork property

To ensure kubelet doesn't attempt network teardown on HostNetwork
containers that no longer exist but are still checkpointed, make
sure we preserve the HostNetwork property in checkpoints.  If
the checkpoint indicates the container was a HostNetwork one,
don't tear down the network since that would fail anyway.

Related: kubernetes/kubernetes#44307 (comment)
@openshift-merge-robot openshift-merge-robot added the vendor-update Touching vendor dir or related files label Oct 30, 2017
@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 30, 2017
@rajatchopra
Copy link
Contributor Author

@rajatchopra
Copy link
Contributor Author

/retest

@knobunc
Copy link
Contributor

knobunc commented Oct 31, 2017

@rajatchopra I think the title should be 'UPSTREAM: 47850: fix for bz1507257 hacked from upstream PR47850'

@knobunc
Copy link
Contributor

knobunc commented Oct 31, 2017

@openshift/networking PTAL

@knobunc knobunc assigned knobunc and unassigned bparees and deads2k Oct 31, 2017
@knobunc
Copy link
Contributor

knobunc commented Oct 31, 2017

/kind bug

@openshift-ci-robot openshift-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Oct 31, 2017
Copy link
Contributor

@danwinship danwinship left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm...

Conflicts were removed manually.

What conflicted? It looks like this PR is basically identical to the upstream commit...

Copy link
Contributor

@pecameron pecameron left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 31, 2017
@rajatchopra rajatchopra changed the title UPSTREAM: drop: fix for bz1507257 hacked from upstream PR47850 UPSTREAM: 47850: fix for bz1507257 hacked from upstream PR47850 Oct 31, 2017
@rajatchopra
Copy link
Contributor Author

What conflicted? It looks like this PR is basically identical to the upstream commit...

ready status is checked using getNetworkReady(podSandboxID) today, but its not used upstream. Conflict here.

Copy link
Contributor

@knobunc knobunc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

@knobunc
Copy link
Contributor

knobunc commented Oct 31, 2017

/test

@knobunc
Copy link
Contributor

knobunc commented Oct 31, 2017

/assign @derekwaynecarr

@eparis
Copy link
Member

eparis commented Nov 1, 2017

/retest
/approve

@openshift-merge-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: eparis, knobunc, pecameron, rajatchopra

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 1, 2017
@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue.

@openshift-merge-robot openshift-merge-robot merged commit 92e746a into openshift:master Nov 1, 2017
@JayKayy
Copy link

JayKayy commented Nov 8, 2017

my team is hitting this issue. Besides filling up the logs very quickly, are these error messages benign?

@shah-zobair
Copy link

shah-zobair commented Apr 4, 2018

This might fix the issue temporarily, run this on each fault node:

for name in $(ls | grep -v `ls /var/lib/docker/containers/ | paste -sd “|” -`); do rm -f /var/lib/dockershim/$name; done

@ustm
Copy link

ustm commented Apr 23, 2018

@shah-zobair
Could you fix your command using 3 grave accent for code block? Thank you.

@shah-zobair
Copy link

@ustm Fixed that, cannot use code block for those backticks in command.

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. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 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.