toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Vendoring libnetwork to avoid a deadlock

Browse Source 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit 4f369a74fac5023e9a46de4b4dbe121a7c2b2c81)
Upstream-commit: 61e59693dc3407ba1d68f8a5be17c117a96467e4
Component: engine
This commit is contained in:
Madhu Venugopal
2016-07-28 11:56:12 -07:00
parent dbdb5ac0d4
commit f9dff992a9
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/engine/vendor/src/github.com/docker/libnetwork/network.go vendored
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.