Skip to content

fix flaky port collisions in gossip discovery tests #5627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pfi79 merged 1 commit into from
Oct 20, 2026
+15 −13
Merged

fix flaky port collisions in gossip discovery tests #5627

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions gossip/discovery/discovery_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,14 @@ func createDiscoveryInstanceWithAnchorPeerTracker(port int, id string, bootstrap
errMsg := fmt.Sprintf("Failed creating listener on address %v for gossip instance: %v", listenAddress, err)
panic(errMsg)
}

if actualPort := ll.Addr().(*net.TCPAddr).Port; actualPort != port {
endpoint = fmt.Sprintf("localhost:%d", actualPort)
self.Endpoint = endpoint
self.InternalEndpoint = endpoint
self.PKIid = []byte(endpoint)
}

s := grpc.NewServer()

config.BootstrapPeers = bootstrapPeers
Expand All @@ -446,13 +454,6 @@ func createDiscoveryInstanceWithAnchorPeerTracker(port int, id string, bootstrap
})
}

if actualPort := ll.Addr().(*net.TCPAddr).Port; actualPort != port {
endpoint = fmt.Sprintf("localhost:%d", actualPort)
self.Endpoint = endpoint
self.InternalEndpoint = endpoint
self.PKIid = []byte(endpoint)
}

gossInst := &gossipInstance{comm: comm, gRGCserv: s, Discovery: discSvc, lsnr: ll, shouldGossip: shouldGossip, port: port, msgInterceptor: f}

proto.RegisterGossipServer(s, gossInst)
Expand Down Expand Up @@ -1165,10 +1166,11 @@ func discPolForPeer(selfPort int) DisclosurePolicy {
}

func TestCertificateChange(t *testing.T) {
bootPeers := []string{bootPeer(42611), bootPeer(42612), bootPeer(42613)}
p1 := createDiscoveryInstance(42611, "d1", bootPeers)
p2 := createDiscoveryInstance(42612, "d2", bootPeers)
p3 := createDiscoveryInstance(42613, "d3", bootPeers)
p1 := createDiscoveryInstance(0, "d1", nil)
p1Endpoint := p1.discoveryImpl().self.InternalEndpoint
p2 := createDiscoveryInstance(0, "d2", []string{p1Endpoint})
p2Endpoint := p2.discoveryImpl().self.InternalEndpoint
p3 := createDiscoveryInstance(0, "d3", []string{p1Endpoint, p2Endpoint})

// Wait for membership establishment
assertMembership(t, []*gossipInstance{p1, p2, p3}, 2)
Expand Down Expand Up @@ -1213,7 +1215,7 @@ func TestCertificateChange(t *testing.T) {

// Tell the first peer that the second peer's PKI-ID has changed
// So that it will purge it from the membership entirely
p1.comm.identitySwitch <- common.PKIidType("localhost:42612")
p1.comm.identitySwitch <- common.PKIidType(p2Endpoint)

c1 = pingCount1()
c3 = pingCount3()
Expand Down Expand Up @@ -1938,7 +1940,7 @@ func portOfEndpoint(endpoint string) int {
}

func TestHandleAliveMessage_RelearnsMemberAfterConcurrentPurge(t *testing.T) {
inst := createDiscoveryInstanceWithNoGossip(33700, "d0", []string{})
inst := createDiscoveryInstanceWithNoGossip(0, "d0", []string{})
defer inst.Stop()

impl := inst.discoveryImpl()
Expand Down