0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1533 from aboch/ag

Browse source 
Allow concurrent calls to agentClose
This commit is contained in:
Jana Radhakrishnan 2016-11-02 09:53:28 -07:00 • committed by GitHub
commit 6ffe3a2b3d
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libnetwork/agent.go
View file

@ -328,22 +328,26 @@ func (c *controller) agentDriverNotify(d driverapi.Driver) {
}
func (c *controller) agentClose() {
if c.agent == nil {
// Acquire current agent instance and reset its pointer
// then run closing functions
c.Lock()
agent := c.agent
c.agent = nil
c.Unlock()
if agent == nil {
return
}
for _, cancelFuncs := range c.agent.driverCancelFuncs {
for _, cancelFuncs := range agent.driverCancelFuncs {
for _, cancel := range cancelFuncs {
cancel()
}
}
c.agent.epTblCancel()
c.agent.networkDB.Close()
agent.epTblCancel()
c.Lock()
c.agent = nil
c.Unlock()
agent.networkDB.Close()
}
func (n *network) isClusterEligible() bool {