Skip to content

Commit

Permalink
UPSTREAM: 52864: dockershim: fine-tune network-ready handling on sand…
Browse files Browse the repository at this point in the history
…box 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
  • Loading branch information
dcbw committed Sep 28, 2017
1 parent 092c32e commit 1182948
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 1182948

Please sign in to comment.