diff options
| author | Madhu Venugopal <madhu@docker.com> | 2016-01-16 14:24:44 -0800 |
|---|---|---|
| committer | Madhu Venugopal <madhu@docker.com> | 2016-01-17 14:47:49 -0800 |
| commit | a7c52918fd25735a7303556e7a606159fc53228a (patch) | |
| tree | f12ea6dba16bdf67ddd1b63fc50f136f69e45528 /libnetwork/default_gateway.go | |
| parent | ef508a21ed0dbd1639d819a366b262d1b70eedcd (diff) | |
| download | docker-a7c52918fd25735a7303556e7a606159fc53228a.tar.gz | |
Force delete sandbox during sandboxCleanup
Stale sandbox and endpoints are cleaned up during controller init.
Since we reuse the exact same code-path, for sandbox and endpoint
delete, they try to load the plugin and it causes daemon startup
timeouts since the external plugin containers cant be loaded at that
time. Since the cleanup is actually performed for the libnetwork core
states, we can force delete sandbox and endpoint even if the driver is
not loaded.
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Diffstat (limited to 'libnetwork/default_gateway.go')
| -rw-r--r-- | libnetwork/default_gateway.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libnetwork/default_gateway.go b/libnetwork/default_gateway.go index bfd7b725d3..9a3ca0d6bd 100644 --- a/libnetwork/default_gateway.go +++ b/libnetwork/default_gateway.go @@ -84,7 +84,7 @@ func (sb *sandbox) clearDefaultGW() error { return nil } - if err := ep.sbLeave(sb); err != nil { + if err := ep.sbLeave(sb, false); err != nil { return fmt.Errorf("container %s: endpoint leaving GW Network failed: %v", sb.containerID, err) } if err := ep.Delete(false); err != nil { |