From 61edff3eee58b6566d7c079d4ce9661e016be569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20Podg=C3=B3rski?= Date: Wed, 13 Jan 2021 15:37:13 +0100 Subject: [PATCH] Apply closed channel fix https://github.com/molecula/pilosa/pull/1323/commits/45619a5b7bb2a634fc7e88d6d511b7f2ada05257 --- gossip/gossip.go | 8 +++++++- test/port/port_mapper.go | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gossip/gossip.go b/gossip/gossip.go index 281747252..a41d05065 100644 --- a/gossip/gossip.go +++ b/gossip/gossip.go @@ -426,7 +426,13 @@ func (g *eventReceiver) NotifyUpdate(n *memberlist.Node) { } func (g *eventReceiver) Close() { - close(g.closed) + // TODO workaround to make tests pass. We are going to delete this code anyways. + select { + case <-g.closed: + return + default: + close(g.closed) + } } func (g *eventReceiver) listen() { diff --git a/test/port/port_mapper.go b/test/port/port_mapper.go index 94ac32978..a20e868a0 100644 --- a/test/port/port_mapper.go +++ b/test/port/port_mapper.go @@ -98,7 +98,7 @@ func (pm *globalPortMapper) allocateAtTop() { pm.availPorts = make([]net.Listener, pm.numPorts) i := 0 - for next := 65000; i < pm.numPorts && next > 0; next-- { + for next := 65000; i < pm.numPorts && next > 1000; next-- { lsn, err := net.Listen("tcp", fmt.Sprintf(":%d", next)) if err != nil { //fmt.Printf("next=%v, err = %v\n", next+1, err)