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

Addressing code review comments

Browse source 
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
This commit is contained in:
Flavio Crisciani 2017-09-20 08:37:18 -07:00
parent 2bad0fbedf
commit 181115b350
3 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libnetwork/drivers/overlay/joinleave.go
View file

@ -224,7 +224,6 @@ func (d *driver) Leave(nid, eid string) error {
return types.InternalMaskableErrorf("could not find endpoint with id %s", eid) return types.InternalMaskableErrorf("could not find endpoint with id %s", eid)
} }
logrus.Errorf("The channel is valid:%t", d.notifyCh != nil)
if d.notifyCh != nil { if d.notifyCh != nil {
d.notifyCh <- ovNotify{ d.notifyCh <- ovNotify{
action: "leave", action: "leave",

4
libnetwork/drivers/overlay/ov_network.go
View file

@ -769,7 +769,7 @@ func (n *network) watchMiss(nlSock *nl.NetlinkSocket) {
continue continue
} }
n.driver.peerAdd(n.id, "dummy", ip, IPmask, mac, vtep, l2Miss, l3Miss, false) n.driver.peerAdd(n.id, "dummy", ip, IPmask, mac, vtep, l2Miss, l3Miss, false)
} else { } else if l3Miss && time.Since(t) > 500*time.Millisecond {
// All the local peers will trigger a miss notification but this one is expected and the local container will reply // All the local peers will trigger a miss notification but this one is expected and the local container will reply
// autonomously to the ARP request // autonomously to the ARP request
// In case the gc_thresh3 values is low kernel might reject new entries during peerAdd. This will trigger the following // In case the gc_thresh3 values is low kernel might reject new entries during peerAdd. This will trigger the following
@ -778,7 +778,6 @@ func (n *network) watchMiss(nlSock *nl.NetlinkSocket) {
// Entries which are marked as permanent are never deleted by the garbage-collector. // Entries which are marked as permanent are never deleted by the garbage-collector.
// The time limit here is to guarantee that the dbSearch is not // The time limit here is to guarantee that the dbSearch is not
// done too frequently causing a stall of the peerDB operations. // done too frequently causing a stall of the peerDB operations.
if l3Miss && time.Since(t) > 500*time.Millisecond {
t = time.Now() t = time.Now()
pKey, pEntry, err := n.driver.peerDbSearch(n.id, ip) pKey, pEntry, err := n.driver.peerDbSearch(n.id, ip)
if !pEntry.isLocal { if !pEntry.isLocal {
@ -789,7 +788,6 @@ func (n *network) watchMiss(nlSock *nl.NetlinkSocket) {
} }
} }
} }
}
func (d *driver) addNetwork(n *network) { func (d *driver) addNetwork(n *network) {
d.Lock() d.Lock()

2
libnetwork/osl/neigh_linux.go
View file

@ -188,7 +188,7 @@ func (n *networkNamespace) AddNeighbor(dstIP net.IP, dstMac net.HardwareAddr, fo
n.Lock() n.Lock()
n.neighbors = append(n.neighbors, nh) n.neighbors = append(n.neighbors, nh)
n.Unlock() n.Unlock()
logrus.Debugf("Neighbor entry added for IP %v, mac %v on ifc:%s", dstIP, dstMac, nh.linkName) logrus.Debugf("Neighbor entry added for IP:%v, mac:%v on ifc:%s", dstIP, dstMac, nh.linkName)
return nil return nil
} }