From 5663bc2fa3f71a0ee0da05b7e632b6e577327a36 Mon Sep 17 00:00:00 2001 From: Ivan Kozlovic Date: Mon, 22 Aug 2022 12:35:37 -0600 Subject: [PATCH] Reduce length of some clustering tests Since PR #3381, the 2 tests modified here would take twice as long (around 245 seconds) to complete. Talking with Matthias, he suggested using a variable instead of a const and set it to 0 for those 2 tests since they don't really need that to be set. Signed-off-by: Ivan Kozlovic --- server/jetstream_cluster.go | 4 +++- server/jetstream_super_cluster_test.go | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/server/jetstream_cluster.go b/server/jetstream_cluster.go index 6488436f..8dfd788e 100644 --- a/server/jetstream_cluster.go +++ b/server/jetstream_cluster.go @@ -1633,8 +1633,10 @@ func currentPeerCount(ci *ClusterInfo, peerSet []string, leaderId string) (curre return } +const defaultScaleDownDelayTicks = 2 + // how many migration tracker ticks of delay to induce -const scaleDownDelayTicks = 2 +var scaleDownDelayTicks = defaultScaleDownDelayTicks // Monitor our stream node for this stream. func (js *jetStream) monitorStream(mset *stream, sa *streamAssignment, sendSnapshot bool) { diff --git a/server/jetstream_super_cluster_test.go b/server/jetstream_super_cluster_test.go index 6d8862e0..fbd976fe 100644 --- a/server/jetstream_super_cluster_test.go +++ b/server/jetstream_super_cluster_test.go @@ -2869,6 +2869,10 @@ func TestJetStreamSuperClusterMoveCancel(t *testing.T) { } func TestJetStreamSuperClusterDoubleStreamMove(t *testing.T) { + // Shorten this test by factor of 2. + scaleDownDelayTicks = 0 + defer func() { scaleDownDelayTicks = defaultScaleDownDelayTicks }() + server := map[string]struct{}{} sc := createJetStreamSuperClusterWithTemplateAndModHook(t, jsClusterTempl, 4, 2, func(serverName, clusterName, storeDir, conf string) string { @@ -3069,6 +3073,10 @@ func TestJetStreamSuperClusterDoubleStreamMove(t *testing.T) { } func TestJetStreamSuperClusterPeerEvacuationAndStreamReassignment(t *testing.T) { + // Shorten this test by factor of 2. + scaleDownDelayTicks = 0 + defer func() { scaleDownDelayTicks = defaultScaleDownDelayTicks }() + s := createJetStreamSuperClusterWithTemplateAndModHook(t, jsClusterTempl, 4, 2, func(serverName, clusterName, storeDir, conf string) string { return fmt.Sprintf("%s\nserver_tags: [cluster:%s, server:%s]", conf, clusterName, serverName)