Merge branch 'main' into dev

This commit is contained in:
Derek Collison
2023-04-02 04:23:52 -07:00
9 changed files with 111 additions and 47 deletions

View File

@@ -4936,11 +4936,11 @@ func TestJetStreamClusterDuplicateMsgIdsOnCatchupAndLeaderTakeover(t *testing.T)
// Now restart
sr = c.restartServer(sr)
c.waitOnStreamCurrent(sr, "$G", "TEST")
c.waitOnStreamLeader("$G", "TEST")
// Now make them the leader.
for sr != c.streamLeader("$G", "TEST") {
_, err = nc.Request(fmt.Sprintf(JSApiStreamLeaderStepDownT, "TEST"), nil, time.Second)
require_NoError(t, err)
nc.Request(fmt.Sprintf(JSApiStreamLeaderStepDownT, "TEST"), nil, time.Second)
c.waitOnStreamLeader("$G", "TEST")
}