Merge branch 'main' into dev

This commit is contained in:
Derek Collison
2023-01-27 13:41:48 -08:00
3 changed files with 68 additions and 8 deletions

View File

@@ -6631,9 +6631,12 @@ func TestJetStreamClusterSnapshotBeforePurgeAndCatchup(t *testing.T) {
mset, err = nl.GlobalAccount().lookupStream("TEST")
require_NoError(t, err)
if state := mset.state(); state.FirstSeq != 2001 || state.LastSeq != 3000 {
t.Fatalf("Incorrect state: %+v", state)
}
checkFor(t, 2*time.Second, 100*time.Millisecond, func() error {
if state := mset.state(); state.FirstSeq != 2001 || state.LastSeq != 3000 {
return fmt.Errorf("Incorrect state: %+v", state)
}
return nil
})
// Make sure we only sent 1 sync catchup msg.
nmsgs, _, _ := sub.Pending()