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

libnetwork: Network.updateSvcRecord: remove unused localEps arg

Browse source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-09-14 01:44:43 +02:00
parent 37b2ea9a8d
commit 8ae5dc4aae
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
3 changed files with 12 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libnetwork/endpoint.go
View file

@ -567,9 +567,8 @@ func (ep *Endpoint) sbJoin(sb *Sandbox, options ...EndpointOption) (err error) {
func (ep *Endpoint) rename(name string) error {
var (
err error
netWatch *netWatch
ok bool
err error
ok bool
)
n := ep.getNetwork()
@ -591,12 +590,13 @@ func (ep *Endpoint) rename(name string) error {
}
} else {
c.mu.Lock()
netWatch, ok = c.nmap[n.ID()]
_, ok = c.nmap[n.ID()]
c.mu.Unlock()
if !ok {
// FIXME(thaJeztah): what is this check for, or is this to prevent a race condition (network removed)?
return fmt.Errorf("watch null for network %q", n.Name())
}
n.updateSvcRecord(ep, c.getLocalEps(netWatch), false)
n.updateSvcRecord(ep, false)
}
oldName := ep.name
@ -621,13 +621,13 @@ func (ep *Endpoint) rename(name string) error {
}
}()
} else {
n.updateSvcRecord(ep, c.getLocalEps(netWatch), true)
n.updateSvcRecord(ep, true)
defer func() {
if err != nil {
n.updateSvcRecord(ep, c.getLocalEps(netWatch), false)
n.updateSvcRecord(ep, false)
ep.name = oldName
ep.anonymous = oldAnonymous
n.updateSvcRecord(ep, c.getLocalEps(netWatch), true)
n.updateSvcRecord(ep, true)
}
}()
}

2
libnetwork/network.go
View file

@ -1272,7 +1272,7 @@ func (n *Network) EndpointByID(id string) (*Endpoint, error) {
return ep, nil
}
func (n *Network) updateSvcRecord(ep *Endpoint, localEps []*Endpoint, isAdd bool) {
func (n *Network) updateSvcRecord(ep *Endpoint, isAdd bool) {
var ipv6 net.IP
epName := ep.Name()
if iface := ep.Iface(); iface != nil && iface.Address() != nil {

18
libnetwork/store.go
View file

@ -196,18 +196,6 @@ type netWatch struct {
remoteEps map[string]*Endpoint
}
func (c *Controller) getLocalEps(nw *netWatch) []*Endpoint {
c.mu.Lock()
defer c.mu.Unlock()
var epl []*Endpoint
for _, ep := range nw.localEps {
epl = append(epl, ep)
}
return epl
}
func (c *Controller) watchSvcRecord(ep *Endpoint) {
c.watchCh <- ep
}
@ -231,7 +219,7 @@ func (c *Controller) processEndpointCreate(ep *Endpoint) {
if ok {
// Update the svc db for the local endpoint join right away
n.updateSvcRecord(ep, c.getLocalEps(nw), true)
n.updateSvcRecord(ep, true)
c.mu.Lock()
nw.localEps[endpointID] = ep
@ -252,7 +240,7 @@ func (c *Controller) processEndpointCreate(ep *Endpoint) {
// Update the svc db for the local endpoint join right away
// Do this before adding this ep to localEps so that we don't
// try to update this ep's container's svc records
n.updateSvcRecord(ep, c.getLocalEps(nw), true)
n.updateSvcRecord(ep, true)
c.mu.Lock()
nw.localEps[endpointID] = ep
@ -277,7 +265,7 @@ func (c *Controller) processEndpointDelete(ep *Endpoint) {
// Update the svc db about local endpoint leave right away
// Do this after we remove this ep from localEps so that we
// don't try to remove this svc record from this ep's container.
n.updateSvcRecord(ep, c.getLocalEps(nw), false)
n.updateSvcRecord(ep, false)
c.mu.Lock()
if len(nw.localEps) == 0 {