Skip to content

ConnectToNetwork is modfying the container but is not locking the o… #344

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.

Sign up for GitHub

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

Open
free2k wants to merge 1 commit into
base: docker-1.13.1-rhel
Choose a base branch
from
Open

ConnectToNetwork is modfying the container but is not locking the o… #344

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions daemon/container_operations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,6 +956,9 @@ func (daemon *Daemon) ConnectToNetwork(container *container.Container, idOrName
if endpointConfig == nil {
endpointConfig = &networktypes.EndpointSettings{}
}
container.Lock()
defer container.Unlock()

if !container.Running {
if container.RemovalInProgress || container.Dead {
return errRemovalContainer(container.ID)
Expand All @@ -978,7 +981,7 @@ func (daemon *Daemon) ConnectToNetwork(container *container.Container, idOrName
return err
}
}
if err := container.ToDiskLocking(); err != nil {
if err := container.ToDisk(); err != nil {
return fmt.Errorf("Error saving container to disk: %v", err)
}
return nil
Expand All @@ -987,6 +990,9 @@ func (daemon *Daemon) ConnectToNetwork(container *container.Container, idOrName
// DisconnectFromNetwork disconnects container from network n.
func (daemon *Daemon) DisconnectFromNetwork(container *container.Container, networkName string, force bool) error {
n, err := daemon.FindNetwork(networkName)
container.Lock()
defer container.Unlock()

if !container.Running || (err != nil && force) {
if container.RemovalInProgress || container.Dead {
return errRemovalContainer(container.ID)
Expand Down Expand Up @@ -1014,7 +1020,7 @@ func (daemon *Daemon) DisconnectFromNetwork(container *container.Container, netw
return err
}

if err := container.ToDiskLocking(); err != nil {
if err := container.ToDisk(); err != nil {
return fmt.Errorf("Error saving container to disk: %v", err)
}

Expand Down