From 66e7b6f4bdd79085615a750ee971533706ae8fed Mon Sep 17 00:00:00 2001 From: Derek Collison Date: Sun, 2 Apr 2023 19:49:53 -0700 Subject: [PATCH 1/2] Bump to 2.9.16-RC.4 Signed-off-by: Derek Collison --- server/const.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/const.go b/server/const.go index 26e634bb..8eaf86a1 100644 --- a/server/const.go +++ b/server/const.go @@ -41,7 +41,7 @@ var ( const ( // VERSION is the current version for the server. - VERSION = "2.9.16-RC.3" + VERSION = "2.9.16-RC.4" // PROTO is the currently supported protocol. // 0 was the original From 94278e731aa3671bd564f8269d4a91db199617d7 Mon Sep 17 00:00:00 2001 From: Derek Collison Date: Sun, 2 Apr 2023 19:57:34 -0700 Subject: [PATCH 2/2] More tweaks to test due to slow network proxy being more accurate Signed-off-by: Derek Collison --- server/norace_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/norace_test.go b/server/norace_test.go index 8030e592..06da28f8 100644 --- a/server/norace_test.go +++ b/server/norace_test.go @@ -5566,7 +5566,7 @@ func TestNoRaceJetStreamSuperClusterStreamMoveLongRTT(t *testing.T) { // Make C2 far away. gwm := gwProxyMap{ "C2": &gwProxy{ - rtt: 50 * time.Millisecond, + rtt: 20 * time.Millisecond, up: 1 * 1024 * 1024 * 1024, // 1gbit down: 1 * 1024 * 1024 * 1024, // 1gbit }, @@ -5585,7 +5585,7 @@ func TestNoRaceJetStreamSuperClusterStreamMoveLongRTT(t *testing.T) { } // Place a stream in C1. - _, err := js.AddStream(cfg) + _, err := js.AddStream(cfg, nats.MaxWait(10*time.Second)) require_NoError(t, err) chunk := bytes.Repeat([]byte("Z"), 1000*1024) // ~1MB