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

enforce order of lock acquisitions on network/controller, fixes #2632

Browse source 
Signed-off-by: Francesco Degrassi <francesco.degrassi@optionfactory.net>
This commit is contained in:
Francesco Degrassi 2021-04-21 15:49:12 +02:00
parent 7ca3aff8d2
commit f41a6d5c95
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libnetwork/network.go
View file

@ -1409,21 +1409,21 @@ func (n *network) addSvcRecords(eID, name, serviceID string, epIP, epIPv6 net.IP
if n.ingress { if n.ingress {
return return
} }
networkID := n.ID()
logrus.Debugf("%s (%.7s).addSvcRecords(%s, %s, %s, %t) %s sid:%s", eID, n.ID(), name, epIP, epIPv6, ipMapUpdate, method, serviceID) logrus.Debugf("%s (%.7s).addSvcRecords(%s, %s, %s, %t) %s sid:%s", eID, networkID, name, epIP, epIPv6, ipMapUpdate, method, serviceID)
c := n.getController() c := n.getController()
c.Lock() c.Lock()
defer c.Unlock() defer c.Unlock()
sr, ok := c.svcRecords[n.ID()] sr, ok := c.svcRecords[networkID]
if !ok { if !ok {
sr = svcInfo{ sr = svcInfo{
svcMap: setmatrix.NewSetMatrix(), svcMap: setmatrix.NewSetMatrix(),
svcIPv6Map: setmatrix.NewSetMatrix(), svcIPv6Map: setmatrix.NewSetMatrix(),
ipMap: setmatrix.NewSetMatrix(), ipMap: setmatrix.NewSetMatrix(),
} }
c.svcRecords[n.ID()] = sr c.svcRecords[networkID] = sr
} }
if ipMapUpdate { if ipMapUpdate {
@ -1445,14 +1445,14 @@ func (n *network) deleteSvcRecords(eID, name, serviceID string, epIP net.IP, epI
if n.ingress { if n.ingress {
return return
} }
networkID := n.ID()
logrus.Debugf("%s (%.7s).deleteSvcRecords(%s, %s, %s, %t) %s sid:%s ", eID, n.ID(), name, epIP, epIPv6, ipMapUpdate, method, serviceID) logrus.Debugf("%s (%.7s).deleteSvcRecords(%s, %s, %s, %t) %s sid:%s ", eID, networkID, name, epIP, epIPv6, ipMapUpdate, method, serviceID)
c := n.getController() c := n.getController()
c.Lock() c.Lock()
defer c.Unlock() defer c.Unlock()
sr, ok := c.svcRecords[n.ID()] sr, ok := c.svcRecords[networkID]
if !ok { if !ok {
return return
} }
@ -1972,9 +1972,10 @@ func (n *network) ResolveName(req string, ipType int) ([]net.IP, bool) {
var ipv6Miss bool var ipv6Miss bool
c := n.getController() c := n.getController()
networkID := n.ID()
c.Lock() c.Lock()
defer c.Unlock() defer c.Unlock()
sr, ok := c.svcRecords[n.ID()] sr, ok := c.svcRecords[networkID]
if !ok { if !ok {
return nil, false return nil, false
@ -2012,10 +2013,11 @@ func (n *network) ResolveName(req string, ipType int) ([]net.IP, bool) {
} }
func (n *network) HandleQueryResp(name string, ip net.IP) { func (n *network) HandleQueryResp(name string, ip net.IP) {
networkID := n.ID()
c := n.getController() c := n.getController()
c.Lock() c.Lock()
defer c.Unlock() defer c.Unlock()
sr, ok := c.svcRecords[n.ID()] sr, ok := c.svcRecords[networkID]
if !ok { if !ok {
return return
@ -2031,10 +2033,11 @@ func (n *network) HandleQueryResp(name string, ip net.IP) {
} }
func (n *network) ResolveIP(ip string) string { func (n *network) ResolveIP(ip string) string {
networkID := n.ID()
c := n.getController() c := n.getController()
c.Lock() c.Lock()
defer c.Unlock() defer c.Unlock()
sr, ok := c.svcRecords[n.ID()] sr, ok := c.svcRecords[networkID]
if !ok { if !ok {
return "" return ""
@ -2085,9 +2088,10 @@ func (n *network) ResolveService(name string) ([]*net.SRV, []net.IP) {
proto := parts[1] proto := parts[1]
svcName := strings.Join(parts[2:], ".") svcName := strings.Join(parts[2:], ".")
networkID := n.ID()
c.Lock() c.Lock()
defer c.Unlock() defer c.Unlock()
sr, ok := c.svcRecords[n.ID()] sr, ok := c.svcRecords[networkID]
if !ok { if !ok {
return nil, nil return nil, nil