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

libn/d/o/ovmanager: drop mutex from network type

Browse source 
In the network.obtainVxlanID() method, the mutex only guards a local
variable and a function argument. Locking is therefore unnecessary.

The network.releaseVxlanID() method is only called in two contexts:
driver.NetworkAllocate(), where the network struct is a local variable
and network.releaseVxlanID() is only called in failure code-paths in
which the network does not escape; and driver.NetworkFree(), while the
driver mutex is held. Locking is therefore unnecessary.

Signed-off-by: Cory Snider <csnider@mirantis.com>
This commit is contained in:
Cory Snider 2023-07-04 18:59:38 -04:00
parent 6fb6635ceb
commit e97492e579
1 changed files with 3 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libnetwork/drivers/overlay/ovmanager/ovmanager.go
View file

@ -40,7 +40,6 @@ type subnet struct {
type network struct {
id string
driver *driver
mu sync.Mutex
subnets []*subnet
}
@ -160,24 +159,14 @@ func (d *driver) NetworkFree(id string) error {
}
func (n *network) obtainVxlanID(s *subnet) error {
var (
err error
vni uint64
)
n.mu.Lock()
vni = uint64(s.vni)
n.mu.Unlock()
vni := uint64(s.vni)
if vni == 0 {
vni, err = n.driver.vxlanIdm.GetIDInRange(vxlanIDStart, vxlanIDEnd, true)
vni, err := n.driver.vxlanIdm.GetIDInRange(vxlanIDStart, vxlanIDEnd, true)
if err != nil {
return err
}
n.mu.Lock()
s.vni = uint32(vni)
n.mu.Unlock()
return nil
}
@ -185,17 +174,10 @@ func (n *network) obtainVxlanID(s *subnet) error {
}
func (n *network) releaseVxlanID() {
n.mu.Lock()
vnis := make([]uint32, 0, len(n.subnets))
for _, s := range n.subnets {
vnis = append(vnis, s.vni)
n.driver.vxlanIdm.Release(uint64(s.vni))
s.vni = 0
}
n.mu.Unlock()
for _, vni := range vnis {
n.driver.vxlanIdm.Release(uint64(vni))
}
}
func (d *driver) CreateNetwork(id string, option map[string]interface{}, nInfo driverapi.NetworkInfo, ipV4Data, ipV6Data []driverapi.IPAMData) error {