Skip to content

De-flake by waiting for account fetch in (super) cluster #6329

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
derekcollison merged 1 commit into from
Jan 6, 2025
Merged

De-flake by waiting for account fetch in (super) cluster #6329

Show file tree
Hide file tree
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
21 changes: 21 additions & 0 deletions server/jetstream_helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,27 @@ func (sc *supercluster) waitOnLeader() {
sc.t.Fatalf("Expected a cluster leader, got none")
}

func (sc *supercluster) waitOnAccount(account string) {
sc.t.Helper()
expires := time.Now().Add(40 * time.Second)
for time.Now().Before(expires) {
found := true
for _, c := range sc.clusters {
for _, s := range c.servers {
acc, err := s.fetchAccount(account)
found = found && err == nil && acc != nil
}
}
if found {
return
}
time.Sleep(100 * time.Millisecond)
continue
}

sc.t.Fatalf("Expected account %q to exist but didn't", account)
}

func (sc *supercluster) waitOnAllCurrent() {
sc.t.Helper()
for _, c := range sc.clusters {
Expand Down
6 changes: 6 additions & 0 deletions server/jetstream_jwt_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,8 @@ func TestJetStreamJWTMove(t *testing.T) {
require_False(t, s.JetStreamEnabled())
updateJwt(t, s.ClientURL(), sysCreds, accJwt, 10)

sc.waitOnAccount(aExpPub)

s = sc.serverByName("C2-S1")
require_False(t, s.JetStreamEnabled())

Expand Down Expand Up @@ -609,6 +611,8 @@ func TestJetStreamJWTClusteredTiersChange(t *testing.T) {
updateJwt(t, c.randomServer().ClientURL(), sysCreds, sysJwt, 3)
updateJwt(t, c.randomServer().ClientURL(), sysCreds, accJwt1, 3)

c.waitOnAccount(aExpPub)

nc := natsConnect(t, c.randomServer().ClientURL(), nats.UserCredentials(accCreds))
defer nc.Close()

Expand Down Expand Up @@ -693,6 +697,8 @@ func TestJetStreamJWTClusteredDeleteTierWithStreamAndMove(t *testing.T) {
updateJwt(t, c.randomServer().ClientURL(), sysCreds, sysJwt, 3)
updateJwt(t, c.randomServer().ClientURL(), sysCreds, accJwt1, 3)

c.waitOnAccount(aExpPub)

nc := natsConnect(t, c.randomServer().ClientURL(), nats.UserCredentials(accCreds))
defer nc.Close()

Expand Down