From 79574eea31109e4c01ed9feb443eb74c031081dd Mon Sep 17 00:00:00 2001 From: shuai-z Date: Tue, 21 Oct 2014 12:24:01 +0800 Subject: [PATCH 1/2] Port number 49153(BeginPortRange) would be returned twice, causing duplication and potential errors. If we first request port 49153 (BeginPortRange) explicitly, and later some time request the next free port (of same ip/proto) by calling RequestPort() with port number 0, we will again get 49153 returned, even if it's currently in use. Because findPort() blindly retured BeginPortRange the first run, without checking if it has already been taken. Signed-off-by: shuai-z Upstream-commit: 9451cf39eff037eccb04319c1e601d08495cab3c Component: engine --- .../daemon/networkdriver/portallocator/portallocator.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/components/engine/daemon/networkdriver/portallocator/portallocator.go b/components/engine/daemon/networkdriver/portallocator/portallocator.go index d4fcc6e725..c6e8a66e8d 100644 --- a/components/engine/daemon/networkdriver/portallocator/portallocator.go +++ b/components/engine/daemon/networkdriver/portallocator/portallocator.go @@ -15,6 +15,7 @@ type portMap struct { func newPortMap() *portMap { return &portMap{ p: map[int]struct{}{}, + last: EndPortRange, } } @@ -135,12 +136,6 @@ func ReleaseAll() error { } func (pm *portMap) findPort() (int, error) { - if pm.last == 0 { - pm.p[BeginPortRange] = struct{}{} - pm.last = BeginPortRange - return BeginPortRange, nil - } - for port := pm.last + 1; port != pm.last; port++ { if port > EndPortRange { port = BeginPortRange From b91a2b389f0ee610cc19ce02f15b782a0be3e4d2 Mon Sep 17 00:00:00 2001 From: shuai-z Date: Tue, 21 Oct 2014 13:27:47 +0800 Subject: [PATCH 2/2] added test, gofmtd Signed-off-by: shuai-z Upstream-commit: 2c2edabca5471fa969358cb98619f277d585e76c Component: engine --- .../networkdriver/portallocator/portallocator.go | 2 +- .../portallocator/portallocator_test.go | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/components/engine/daemon/networkdriver/portallocator/portallocator.go b/components/engine/daemon/networkdriver/portallocator/portallocator.go index c6e8a66e8d..e5dd077a9e 100644 --- a/components/engine/daemon/networkdriver/portallocator/portallocator.go +++ b/components/engine/daemon/networkdriver/portallocator/portallocator.go @@ -14,7 +14,7 @@ type portMap struct { func newPortMap() *portMap { return &portMap{ - p: map[int]struct{}{}, + p: map[int]struct{}{}, last: EndPortRange, } } diff --git a/components/engine/daemon/networkdriver/portallocator/portallocator_test.go b/components/engine/daemon/networkdriver/portallocator/portallocator_test.go index 9869c332e9..3fb218502c 100644 --- a/components/engine/daemon/networkdriver/portallocator/portallocator_test.go +++ b/components/engine/daemon/networkdriver/portallocator/portallocator_test.go @@ -214,3 +214,19 @@ func TestPortAllocation(t *testing.T) { t.Fatal("Requesting a dynamic port should never allocate a used port") } } + +func TestNoDuplicateBPR(t *testing.T) { + defer reset() + + if port, err := RequestPort(defaultIP, "tcp", BeginPortRange); err != nil { + t.Fatal(err) + } else if port != BeginPortRange { + t.Fatalf("Expected port %d got %d", BeginPortRange, port) + } + + if port, err := RequestPort(defaultIP, "tcp", 0); err != nil { + t.Fatal(err) + } else if port == BeginPortRange { + t.Fatalf("Acquire(0) allocated the same port twice: %d", port) + } +}