Skip to content
New issue

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

#

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

Already on GitHub? # to your account

De-flake StreamResetOnExpirationDuringPeerDownAndRestartWithLeaderChange #6332

Merged
merged 1 commit into from
Jan 6, 2025
Merged

De-flake StreamResetOnExpirationDuringPeerDownAndRestartWithLeaderChange #6332

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
14 changes: 10 additions & 4 deletions server/jetstream_cluster_2_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6319,8 +6319,12 @@ func TestJetStreamClusterStreamResetOnExpirationDuringPeerDownAndRestartWithLead

// Wait for all messages to expire.
checkFor(t, 5*time.Second, time.Second, func() error {
si, err := js.StreamInfo("TEST")
require_NoError(t, err)
ctx, cancel := context.WithTimeout(context.Background(), time.Second)
defer cancel()
si, err := js.StreamInfo("TEST", nats.Context(ctx))
if err != nil {
return err
}
if si.State.Msgs == 0 {
return nil
}
Expand Down Expand Up @@ -6358,9 +6362,11 @@ func TestJetStreamClusterStreamResetOnExpirationDuringPeerDownAndRestartWithLead
}

// Now move the leader there and double check, but above test is sufficient.
checkFor(t, 10*time.Second, 250*time.Millisecond, func() error {
checkFor(t, 30*time.Second, 250*time.Millisecond, func() error {
_, err = nc.Request(fmt.Sprintf(JSApiStreamLeaderStepDownT, "TEST"), nil, time.Second)
require_NoError(t, err)
if err != nil {
return err
}
c.waitOnStreamLeader("$G", "TEST")
if c.streamLeader("$G", "TEST") == nsl {
return nil
Expand Down
Loading