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

Merge pull request #47004 from thaJeztah/portmapper_rm_err_return

Browse source 
libnetwork/portallocator: PortAllocator.ReleasePort: remove unused err-return
This commit is contained in:
Sebastiaan van Stijn 2024-01-02 18:20:35 +01:00 committed by GitHub
commit 0be7a1e33b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libnetwork/portallocator/portallocator.go
View file

@ -154,7 +154,7 @@ func (p *PortAllocator) RequestPortInRange(ip net.IP, proto string, portStart, p
} }
// ReleasePort releases port from global ports pool for specified ip and proto. // ReleasePort releases port from global ports pool for specified ip and proto.
func (p *PortAllocator) ReleasePort(ip net.IP, proto string, port int) error { func (p *PortAllocator) ReleasePort(ip net.IP, proto string, port int) {
p.mutex.Lock() p.mutex.Lock()
defer p.mutex.Unlock() defer p.mutex.Unlock()
@ -163,10 +163,9 @@ func (p *PortAllocator) ReleasePort(ip net.IP, proto string, port int) error {
} }
protomap, ok := p.ipMap[ip.String()] protomap, ok := p.ipMap[ip.String()]
if !ok { if !ok {
return nil return
} }
delete(protomap[proto].p, port) delete(protomap[proto].p, port)
return nil
} }
func (p *PortAllocator) newPortMap() *portMap { func (p *PortAllocator) newPortMap() *portMap {

20
libnetwork/portallocator/portallocator_test.go
View file

@ -48,9 +48,7 @@ func TestReleasePort(t *testing.T) {
t.Fatalf("Expected port 5000 got %d", port) t.Fatalf("Expected port 5000 got %d", port)
} }
if err := p.ReleasePort(defaultIP, "tcp", 5000); err != nil { p.ReleasePort(defaultIP, "tcp", 5000)
t.Fatal(err)
}
} }
func TestReuseReleasedPort(t *testing.T) { func TestReuseReleasedPort(t *testing.T) {
@ -65,9 +63,7 @@ func TestReuseReleasedPort(t *testing.T) {
t.Fatalf("Expected port 5000 got %d", port) t.Fatalf("Expected port 5000 got %d", port)
} }
if err := p.ReleasePort(defaultIP, "tcp", 5000); err != nil { p.ReleasePort(defaultIP, "tcp", 5000)
t.Fatal(err)
}
port, err = p.RequestPort(defaultIP, "tcp", 5000) port, err = p.RequestPort(defaultIP, "tcp", 5000)
if err != nil { if err != nil {
@ -131,9 +127,7 @@ func TestAllocateAllPorts(t *testing.T) {
// release a port in the middle and ensure we get another tcp port // release a port in the middle and ensure we get another tcp port
port := p.Begin + 5 port := p.Begin + 5
if err := p.ReleasePort(defaultIP, "tcp", port); err != nil { p.ReleasePort(defaultIP, "tcp", port)
t.Fatal(err)
}
newPort, err := p.RequestPort(defaultIP, "tcp", 0) newPort, err := p.RequestPort(defaultIP, "tcp", 0)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -144,9 +138,7 @@ func TestAllocateAllPorts(t *testing.T) {
// now pm.last == newPort, release it so that it's the only free port of // now pm.last == newPort, release it so that it's the only free port of
// the range, and ensure we get it back // the range, and ensure we get it back
if err := p.ReleasePort(defaultIP, "tcp", newPort); err != nil { p.ReleasePort(defaultIP, "tcp", newPort)
t.Fatal(err)
}
port, err = p.RequestPort(defaultIP, "tcp", 0) port, err = p.RequestPort(defaultIP, "tcp", 0)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -215,9 +207,7 @@ func TestPortAllocation(t *testing.T) {
if _, err := p.RequestPort(ip2, "tcp", 80); err == nil { if _, err := p.RequestPort(ip2, "tcp", 80); err == nil {
t.Fatalf("Acquiring a port already in use should return an error") t.Fatalf("Acquiring a port already in use should return an error")
} }
if err := p.ReleasePort(ip, "tcp", 80); err != nil { p.ReleasePort(ip, "tcp", 80)
t.Fatal(err)
}
if _, err := p.RequestPort(ip, "tcp", 80); err != nil { if _, err := p.RequestPort(ip, "tcp", 80); err != nil {
t.Fatal(err) t.Fatal(err)
} }

11
libnetwork/portmapper/mapper.go
View file

@ -211,16 +211,19 @@ func (pm *PortMapper) Unmap(host net.Addr) error {
switch a := host.(type) { switch a := host.(type) {
case *net.TCPAddr: case *net.TCPAddr:
return pm.allocator.ReleasePort(a.IP, "tcp", a.Port) pm.allocator.ReleasePort(a.IP, "tcp", a.Port)
case *net.UDPAddr: case *net.UDPAddr:
return pm.allocator.ReleasePort(a.IP, "udp", a.Port) pm.allocator.ReleasePort(a.IP, "udp", a.Port)
case *sctp.SCTPAddr: case *sctp.SCTPAddr:
if len(a.IPAddrs) == 0 { if len(a.IPAddrs) == 0 {
return ErrSCTPAddrNoIP return ErrSCTPAddrNoIP
} }
return pm.allocator.ReleasePort(a.IPAddrs[0].IP, "sctp", a.Port) pm.allocator.ReleasePort(a.IPAddrs[0].IP, "sctp", a.Port)
default:
return ErrUnknownBackendAddressType
} }
return ErrUnknownBackendAddressType
return nil
} }
// ReMapAll re-applies all port mappings // ReMapAll re-applies all port mappings