Skip to content

Commit

Permalink
Merge pull request #16602 from dcbw/dockershim-suppress-cni-errors
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue (batch tested with PRs 16525, 16602, 16603).

UPSTREAM: 52864: dockershim: fine-tune network-ready handling on sandbox teardown and removal

If sandbox teardown results in an error, GC will periodically attempt
to again remove the sandbox.  Until the sandbox is removed, pod
sandbox status calls will attempt to enter the pod's namespace and
retrieve the pod IP, but the first teardown attempt may have already
removed the network namespace, resulting in a pointless log error
message that the network namespace doesn't exist, or that nsenter
can't find eth0.

The network-ready mechanism originally attempted to suppress those
messages by ensuring that pod sandbox status skipped network checks
when networking was already torn down, but unfortunately the ready
value was cleared too early.

Also, don't tear down the pod network multiple times if the first
time we tore it down, it succeeded.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1434950

@openshift/networking @eparis @knobunc
  • Loading branch information
openshift-merge-robot authored Sep 29, 2017
2 parents 0d882b8 + 1182948 commit b142f87
Showing 1 changed file with 9 additions and 4 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b142f87

Please sign in to comment.