From 5980cbf861fbef7944b655a0e789a62eebc4423f Mon Sep 17 00:00:00 2001 From: Derek Collison Date: Wed, 1 Mar 2023 05:23:37 -0800 Subject: [PATCH 1/3] Update to latest dependencies Signed-off-by: Derek Collison --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 3acfb15f..69c9fe86 100644 --- a/go.mod +++ b/go.mod @@ -3,15 +3,15 @@ module github.com/nats-io/nats-server/v2 go 1.19 require ( - github.com/klauspost/compress v1.15.15 + github.com/klauspost/compress v1.16.0 github.com/minio/highwayhash v1.0.2 github.com/nats-io/jwt/v2 v2.3.0 - github.com/nats-io/nats.go v1.23.0 + github.com/nats-io/nats.go v1.24.0 github.com/nats-io/nkeys v0.3.0 github.com/nats-io/nuid v1.0.1 go.uber.org/automaxprocs v1.5.1 - golang.org/x/crypto v0.5.0 - golang.org/x/sys v0.4.0 + golang.org/x/crypto v0.6.0 + golang.org/x/sys v0.5.0 golang.org/x/time v0.3.0 ) diff --git a/go.sum b/go.sum index b54b85d7..eab88f4e 100644 --- a/go.sum +++ b/go.sum @@ -9,14 +9,14 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/klauspost/compress v1.15.15 h1:EF27CXIuDsYJ6mmvtBRlEuB2UVOqHG1tAXgZ7yIO+lw= -github.com/klauspost/compress v1.15.15/go.mod h1:ZcK2JAFqKOpnBlxcLsJzYfrS9X1akm9fHZNnD9+Vo/4= +github.com/klauspost/compress v1.16.0 h1:iULayQNOReoYUe+1qtKOqw9CwJv3aNQu8ivo7lw1HU4= +github.com/klauspost/compress v1.16.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g= github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= github.com/nats-io/jwt/v2 v2.3.0 h1:z2mA1a7tIf5ShggOFlR1oBPgd6hGqcDYsISxZByUzdI= github.com/nats-io/jwt/v2 v2.3.0/go.mod h1:0tqz9Hlu6bCBFLWAASKhE5vUA4c24L9KPUUgvwumE/k= -github.com/nats-io/nats.go v1.23.0 h1:lR28r7IX44WjYgdiKz9GmUeW0uh/m33uD3yEjLZ2cOE= -github.com/nats-io/nats.go v1.23.0/go.mod h1:ki/Scsa23edbh8IRZbCuNXR9TDcbvfaSijKtaqQgw+Q= +github.com/nats-io/nats.go v1.24.0 h1:CRiD8L5GOQu/DcfkmgBcTTIQORMwizF+rPk6T0RaHVQ= +github.com/nats-io/nats.go v1.24.0/go.mod h1:dVQF+BK3SzUZpwyzHedXsvH3EO38aVKuOPkkHlv5hXA= github.com/nats-io/nkeys v0.3.0 h1:cgM5tL53EvYRU+2YLXIK0G2mJtK12Ft9oeooSZMA2G8= github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4= github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= @@ -27,13 +27,13 @@ github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMT go.uber.org/automaxprocs v1.5.1 h1:e1YG66Lrk73dn4qhg8WFSvhF0JuFQF0ERIp4rpuV8Qk= go.uber.org/automaxprocs v1.5.1/go.mod h1:BF4eumQw0P9GtnuxxovUd06vwm1o18oMzFtK66vU6XU= golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE= -golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= +golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc= +golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18= -golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= From ebe08040e98d21367f249a00e4e2da15e83ae6cc Mon Sep 17 00:00:00 2001 From: Derek Collison Date: Wed, 1 Mar 2023 05:44:16 -0800 Subject: [PATCH 2/3] Attempt to fix flapper again Signed-off-by: Derek Collison --- server/norace_test.go | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/server/norace_test.go b/server/norace_test.go index 9fd8702d..787a6e5f 100644 --- a/server/norace_test.go +++ b/server/norace_test.go @@ -5041,11 +5041,13 @@ func TestNoRaceJetStreamClusterInterestPullConsumerStreamLimitBug(t *testing.T) nc, js := jsClientConnect(t, c.randomServer()) defer nc.Close() + limit := uint64(1000) + _, err := js.AddStream(&nats.StreamConfig{ Name: "TEST", Subjects: []string{"foo"}, Retention: nats.InterestPolicy, - MaxMsgs: 2000, + MaxMsgs: int64(limit), Replicas: 3, }) require_NoError(t, err) @@ -5065,10 +5067,7 @@ func TestNoRaceJetStreamClusterInterestPullConsumerStreamLimitBug(t *testing.T) select { case <-pt.C: _, err := js.Publish("foo", []byte("BUG!")) - if err != nil { - t.Logf("Got a publisher error: %v", err) - return - } + require_NoError(t, err) case <-qch: pt.Stop() return @@ -5121,26 +5120,28 @@ func TestNoRaceJetStreamClusterInterestPullConsumerStreamLimitBug(t *testing.T) }() } - time.Sleep(5 * time.Second) + // Make sure we have hit the limit for the number of messages we expected. + checkFor(t, 20*time.Second, 500*time.Millisecond, func() error { + si, err := js.StreamInfo("TEST") + require_NoError(t, err) + if si.State.Msgs < limit { + return fmt.Errorf("Not hit limit yet") + } + return nil + }) + close(qch) wg.Wait() checkFor(t, 20*time.Second, 500*time.Millisecond, func() error { si, err := js.StreamInfo("TEST") - if err != nil { - return err - } + require_NoError(t, err) ci, err := js.ConsumerInfo("TEST", "dur") - if err != nil { - return err - } + require_NoError(t, err) - ld := ci.Delivered.Stream - if si.State.FirstSeq > ld { - ld = si.State.FirstSeq - 1 - } - if si.State.LastSeq-ld != ci.NumPending { - return fmt.Errorf("Expected NumPending to be %d got %d", si.State.LastSeq-ld, ci.NumPending) + np := ci.NumPending + uint64(ci.NumAckPending) + if np != si.State.Msgs { + return fmt.Errorf("Expected NumPending to be %d got %d", si.State.Msgs-uint64(ci.NumAckPending), ci.NumPending) } return nil }) From 4c2efe8c25c57f11ffc11c53031f0e73d2301c94 Mon Sep 17 00:00:00 2001 From: Byron Ruth Date: Wed, 1 Mar 2023 09:27:31 -0500 Subject: [PATCH 3/3] Bump to Go 1.19.6 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 06b876eb..9885567a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ vm: language: go go: -- 1.19.5 +- 1.19.6 addons: apt: