clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-04 12:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not attempt releasing network when not attached to any network

Browse Source 
Sometimes container.cleanup() can be called from multiple paths
for the same container during error conditions from monitor and
regular startup path. So if the container network has been already
released do not try to release it again.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
(cherry picked from commit 6cdf8623d5)
This commit is contained in:
Jana Radhakrishnan
2015-06-01 08:53:49 -07:00
committed by Jessica Frazelle
parent ab7e7a7338
commit 3bed793ba1
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
daemon/container_linux.go
+6
View File
@@ -913,6 +913,12 @@ func (container *Container) ReleaseNetwork() {
return
}
// If the container is not attached to any network do not try
// to release network and generate spurious error messages.
if container.NetworkSettings.NetworkID == "" {
return
}
n, err := container.daemon.netController.NetworkByID(container.NetworkSettings.NetworkID)
if err != nil {
logrus.Errorf("error locating network id %s: %v", container.NetworkSettings.NetworkID, err)