Fixes for tests that depend on fast statsz for jetstream allocations …

…and placements.

Minor fix for new test to cleanup cluster when done.

Signed-off-by: Derek Collison <derek@nats.io>

server/events.go

@@ -98,7 +98,11 @@ const (
 // FIXME(dlc) - make configurable.
 var eventsHBInterval = 30 * time.Second
 
-var statszRateLimit = 1 * time.Second
+// Default minimum wait time for sending statsz
+const defaultStatszRateLimit = 1 * time.Second
+
+// Variable version so we can set in tests.
+var statszRateLimit = defaultStatszRateLimit
 
 type sysMsgHandler func(sub *subscription, client *client, acc *Account, subject, reply string, hdr, msg []byte)
 

server/events_test.go

@@ -1,4 +1,4 @@
-// Copyright 2018-2023 The NATS Authors
+// Copyright 2018-2024 The NATS Authors
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -3540,10 +3540,16 @@ func Benchmark_GetHash(b *testing.B) {
 }
 
 func TestClusterSetupMsgs(t *testing.T) {
+	// Tests will set this general faster, but here we want default for production.
+	original := statszRateLimit
+	statszRateLimit = defaultStatszRateLimit
+	defer func() { statszRateLimit = original }()
+
 	numServers := 10
 	c := createClusterEx(t, false, 0, false, "cluster", numServers)
-	var totalOut int
+	defer shutdownCluster(c)
 
+	var totalOut int
 	for _, server := range c.servers {
 		totalOut += int(server.outMsgs)
 	}

server/jetstream_helpers_test.go

@@ -42,6 +42,9 @@ func init() {
 	maxElectionTimeout = 3500 * time.Millisecond
 	lostQuorumInterval = 2 * time.Second
 	lostQuorumCheck = 4 * hbInterval
+
+	// For statz and jetstream placement speedups as well.
+	statszRateLimit = time.Millisecond * 100
 }
 
 // Used to setup clusters of clusters for tests.

server/jetstream_super_cluster_test.go

@@ -1355,10 +1355,6 @@ func TestJetStreamSuperClusterPushConsumerInterest(t *testing.T) {
 }
 
 func TestJetStreamSuperClusterOverflowPlacement(t *testing.T) {
-	orgStatszRateLimit := statszRateLimit
-	statszRateLimit = time.Millisecond * 100
-	defer func() { statszRateLimit = orgStatszRateLimit }()
-
 	sc := createJetStreamSuperClusterWithTemplate(t, jsClusterMaxBytesTempl, 3, 3)
 	defer sc.shutdown()