Skip to content

tests: fix TestP2PRelay data race #6316

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
gmalouf merged 2 commits into from
May 7, 2025
Merged

tests: fix TestP2PRelay data race #6316

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbd7f1c
tests: fix TestP2PRelay data race
algorandskiy May 7, 2025
871611e
linter: sync.Mutex -> deadlock.mutex
algorandskiy May 7, 2025
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
21 changes: 14 additions & 7 deletions network/p2pNetwork_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import (
"github.com/algorand/go-algorand/network/phonebook"
"github.com/algorand/go-algorand/protocol"
"github.com/algorand/go-algorand/test/partitiontest"
"github.com/algorand/go-deadlock"

pubsub "github.com/libp2p/go-libp2p-pubsub"
pb "github.com/libp2p/go-libp2p-pubsub/pb"
Expand Down Expand Up @@ -894,7 +895,11 @@ func TestP2PRelay(t *testing.T) {
return netA.hasPeers() && netB.hasPeers()
}, 2*time.Second, 50*time.Millisecond)

makeCounterHandler := func(numExpected int, counter *atomic.Uint32, msgs *[][]byte) ([]TaggedMessageValidatorHandler, chan struct{}) {
type logMessages struct {
msgs [][]byte
mu deadlock.Mutex
}
makeCounterHandler := func(numExpected int, counter *atomic.Uint32, msgSink *logMessages) ([]TaggedMessageValidatorHandler, chan struct{}) {
counterDone := make(chan struct{})
counterHandler := []TaggedMessageValidatorHandler{
{
Expand All @@ -903,8 +908,10 @@ func TestP2PRelay(t *testing.T) {
ValidateHandleFunc
}{
ValidateHandleFunc(func(msg IncomingMessage) OutgoingMessage {
if msgs != nil {
*msgs = append(*msgs, msg.Data)
if msgSink != nil {
msgSink.mu.Lock()
msgSink.msgs = append(msgSink.msgs, msg.Data)
msgSink.mu.Unlock()
}
if count := counter.Add(1); int(count) >= numExpected {
close(counterDone)
Expand Down Expand Up @@ -970,8 +977,8 @@ func TestP2PRelay(t *testing.T) {

const expectedMsgs = 10
counter.Store(0)
var loggedMsgs [][]byte
counterHandler, counterDone = makeCounterHandler(expectedMsgs, &counter, &loggedMsgs)
var msgsSink logMessages
counterHandler, counterDone = makeCounterHandler(expectedMsgs, &counter, &msgsSink)
netA.ClearValidatorHandlers()
netA.RegisterValidatorHandlers(counterHandler)

Expand All @@ -991,10 +998,10 @@ func TestP2PRelay(t *testing.T) {
case <-counterDone:
case <-time.After(3 * time.Second):
if c := counter.Load(); c < expectedMsgs {
t.Logf("Logged messages: %v", loggedMsgs)
t.Logf("Logged messages: %v", msgsSink.msgs)
require.Failf(t, "One or more messages failed to reach destination network", "%d > %d", expectedMsgs, c)
} else if c > expectedMsgs {
t.Logf("Logged messages: %v", loggedMsgs)
t.Logf("Logged messages: %v", msgsSink.msgs)
require.Failf(t, "One or more messages that were expected to be dropped, reached destination network", "%d < %d", expectedMsgs, c)
}
}
Expand Down
Loading