From daca3cf3bcb855bab6f138e39fd78d2ee2bf9b22 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Thu, 24 Nov 2016 14:09:53 +0900 Subject: [PATCH] server: fix Watcher InfiniteChannel leak Signed-off-by: FUJITA Tomonori --- server/server.go | 16 +++++----------- server/server_test.go | 5 +++++ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/server/server.go b/server/server.go index fd0ebf1f..d83a4001 100644 --- a/server/server.go +++ b/server/server.go @@ -2554,17 +2554,11 @@ func (w *Watcher) Stop() { } } - w.ch.Close() - // make sure the loop function finishes - func() { - for { - select { - case <-w.realCh: - default: - return - } - } - }() + cleanInfiniteChannel(w.ch) + // the loop function goroutine might be blocked for + // writing to realCh. make sure it finishes. + for range w.realCh { + } } } diff --git a/server/server_test.go b/server/server_test.go index 46ef4be3..c9f142f1 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -138,4 +138,9 @@ func TestMonitor(test *testing.T) { assert.Equal(b.PathList[0].GetNlri().String(), "10.0.0.0/24") assert.Equal(b.PathList[0].IsWithdraw, true) + if _, err := t.AddPath("", []*table.Path{table.NewPath(nil, bgp.NewIPAddrPrefix(24, "10.0.0.0"), true, attrs, time.Now(), false)}); err != nil { + log.Fatal(err) + } + //stop the watcher still having an item. + w.Stop() }