Skip to content

fix: resolve race condition in TestStateFullRound1 by adding retry logic using GetRoundState #2444

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

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

fix: resolve race condition in TestStateFullRound1 by adding retry logic using GetRoundState #2444

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c9f62df
Initial plan
Copilot Sep 15, 2025
1e43d1d
fix: add retry logic in validatePrevote and validatePrecommit to hand…
Copilot Sep 15, 2025
f610e06
fix: improve race condition handling in validatePrevote and validateP…
Copilot Sep 15, 2025
649ddcc
fix: use GetRoundState method instead of direct mutex access in valid…
Copilot Sep 15, 2025
5baa7b5
fix: implement retry logic using GetRoundState() to resolve TestState…
Copilot Sep 15, 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
44 changes: 37 additions & 7 deletions consensus/common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,14 +274,27 @@
}

func validatePrevote(t *testing.T, cs *State, round int32, privVal *validatorStub, blockHash []byte) {
cs.rsMtx.RLock()
prevotes := cs.rs.Votes.Prevotes(round)
cs.rsMtx.RUnlock()
pubKey, err := privVal.GetPubKey()
require.NoError(t, err)
address := pubKey.Address()

Check failure on line 280 in consensus/common_test.go

View workflow job for this annotation

GitHub Actions / golangci-lint 

File is not properly formatted (gofmt)

Check failure on line 280 in consensus/common_test.go

View workflow job for this annotation

GitHub Actions / golangci-lint 

File is not properly formatted (gofmt)
// Simple retry logic to handle race condition
var vote *types.Vote
if vote = prevotes.GetByAddress(address); vote == nil {
for i := 0; i < 30; i++ {
rs := cs.GetRoundState()
prevotes := rs.Votes.Prevotes(round)
vote = prevotes.GetByAddress(address)

if vote != nil {
break
}

if i < 29 {
time.Sleep(2 * time.Millisecond)
}
}

if vote == nil {
panic("Failed to find prevote from validator")
}
if blockHash == nil {
Expand All @@ -295,6 +308,8 @@
}
}



Comment on lines +311 to +312
Copy link
Collaborator

@rootulp rootulp Sep 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these don't seem intentional

Suggested change

func validateLastPrecommit(t *testing.T, cs *State, privVal *validatorStub, blockHash []byte) {
cs.rsMtx.RLock()
votes := cs.rs.LastCommit
Expand All @@ -320,12 +335,28 @@
votedBlockHash,
lockedBlockHash []byte,
) {
precommits := cs.rs.Votes.Precommits(thisRound)
pv, err := privVal.GetPubKey()
require.NoError(t, err)
address := pv.Address()

// Simple retry logic to handle race condition
var vote *types.Vote
if vote = precommits.GetByAddress(address); vote == nil {
var rs *cstypes.RoundState
for i := 0; i < 30; i++ {
rs = cs.GetRoundState()
precommits := rs.Votes.Precommits(thisRound)
vote = precommits.GetByAddress(address)

if vote != nil {
break
}

if i < 29 {
time.Sleep(2 * time.Millisecond)
}
}

if vote == nil {
panic("Failed to find precommit from validator")
}

Expand All @@ -339,7 +370,6 @@
}
}

rs := cs.GetRoundState()
if lockedBlockHash == nil {
if rs.LockedRound != lockRound || rs.LockedBlock != nil {
panic(fmt.Sprintf(
Expand Down
Loading