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 #1487 from mrjana/networkdb

Browse source 
Do not hold ack channel in ack table after closing
This commit is contained in:
Alessandro Boch 2016-10-03 11:44:42 -07:00 • committed by GitHub
commit 421f6e0bf6
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libnetwork/networkdb/cluster.go
View file

@ -559,10 +559,6 @@ func (nDB *NetworkDB) bulkSyncNode(networks []string, node string, unsolicited b
case <-t.C: case <-t.C:
logrus.Errorf("Bulk sync to node %s timed out", node) logrus.Errorf("Bulk sync to node %s timed out", node)
case <-ch: case <-ch:
nDB.Lock()
delete(nDB.bulkSyncAckTbl, node)
nDB.Unlock()
logrus.Debugf("%s: Bulk sync to node %s took %s", nDB.config.NodeName, node, time.Now().Sub(startTime)) logrus.Debugf("%s: Bulk sync to node %s took %s", nDB.config.NodeName, node, time.Now().Sub(startTime))
} }
t.Stop() t.Stop()

5
libnetwork/networkdb/delegate.go
View file

@ -318,12 +318,13 @@ func (nDB *NetworkDB) handleBulkSync(buf []byte) {
// Don't respond to a bulk sync which was not unsolicited // Don't respond to a bulk sync which was not unsolicited
if !bsm.Unsolicited { if !bsm.Unsolicited {
nDB.RLock() nDB.Lock()
ch, ok := nDB.bulkSyncAckTbl[bsm.NodeName] ch, ok := nDB.bulkSyncAckTbl[bsm.NodeName]
nDB.RUnlock()
if ok { if ok {
close(ch) close(ch)
delete(nDB.bulkSyncAckTbl, bsm.NodeName)
} }
nDB.Unlock()
return return
} }