kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #1364 from mavenugo/dl

Browse source 
Check for isAgent() outside the network lock to avoid deadlocks
This commit is contained in:
Santhosh Manohar 2016-07-28 11:52:13 -07:00 • committed by GitHub
commit e42fca1872
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libnetwork/network.go
View file

@ -702,12 +702,13 @@ func (n *network) driver(load bool) (driverapi.Driver, error) {
}
c := n.getController()
isAgent := c.isAgent()
n.Lock()
// If load is not required, driver, cap and err may all be nil
if cap != nil {
n.scope = cap.DataScope
}
if c.isAgent() || n.dynamic {
if isAgent || n.dynamic {
// If we are running in agent mode then all networks
// in libnetwork are local scope regardless of the
// backing driver.