From 93c1131e78b65cf967575aaca63e38b0ffe7a388 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 16 Apr 2025 07:45:21 +0000 Subject: [PATCH] build(deps): bump github.com/nats-io/nats-server/v2 Bumps [github.com/nats-io/nats-server/v2](https://github.com/nats-io/nats-server) from 2.11.0 to 2.11.1. - [Release notes](https://github.com/nats-io/nats-server/releases) - [Changelog](https://github.com/nats-io/nats-server/blob/main/.goreleaser.yml) - [Commits](https://github.com/nats-io/nats-server/compare/v2.11.0...v2.11.1) --- updated-dependencies: - dependency-name: github.com/nats-io/nats-server/v2 dependency-version: 2.11.1 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 +-- .../nats-io/nats-server/v2/server/const.go | 2 +- .../nats-server/v2/server/jetstream.go | 4 +-- .../nats-server/v2/server/jetstream_api.go | 14 ++++++++++ .../nats-io/nats-server/v2/server/stream.go | 27 +++++++++++++++++++ vendor/modules.txt | 2 +- 7 files changed, 48 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 7e38c92e2b..1ded783d85 100644 --- a/go.mod +++ b/go.mod @@ -55,7 +55,7 @@ require ( github.com/mitchellh/mapstructure v1.5.0 github.com/mna/pigeon v1.3.0 github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 - github.com/nats-io/nats-server/v2 v2.11.0 + github.com/nats-io/nats-server/v2 v2.11.1 github.com/nats-io/nats.go v1.41.0 github.com/oklog/run v1.1.0 github.com/olekukonko/tablewriter v0.0.5 diff --git a/go.sum b/go.sum index 11b63592e1..a0be1711fa 100644 --- a/go.sum +++ b/go.sum @@ -827,8 +827,8 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRW github.com/namedotcom/go v0.0.0-20180403034216-08470befbe04/go.mod h1:5sN+Lt1CaY4wsPvgQH/jsuJi4XO2ssZbdsIizr4CVC8= github.com/nats-io/jwt/v2 v2.7.3 h1:6bNPK+FXgBeAqdj4cYQ0F8ViHRbi7woQLq4W29nUAzE= github.com/nats-io/jwt/v2 v2.7.3/go.mod h1:GvkcbHhKquj3pkioy5put1wvPxs78UlZ7D/pY+BgZk4= -github.com/nats-io/nats-server/v2 v2.11.0 h1:fdwAT1d6DZW/4LUz5rkvQUe5leGEwjjOQYntzVRKvjE= -github.com/nats-io/nats-server/v2 v2.11.0/go.mod h1:leXySghbdtXSUmWem8K9McnJ6xbJOb0t9+NQ5HTRZjI= +github.com/nats-io/nats-server/v2 v2.11.1 h1:LwdauqMqMNhTxTN3+WFTX6wGDOKntHljgZ+7gL5HCnk= +github.com/nats-io/nats-server/v2 v2.11.1/go.mod h1:leXySghbdtXSUmWem8K9McnJ6xbJOb0t9+NQ5HTRZjI= github.com/nats-io/nats.go v1.41.0 h1:PzxEva7fflkd+n87OtQTXqCTyLfIIMFJBpyccHLE2Ko= github.com/nats-io/nats.go v1.41.0/go.mod h1:wV73x0FSI/orHPSYoyMeJB+KajMDoWyXmFaRrrYaaTo= github.com/nats-io/nkeys v0.4.10 h1:glmRrpCmYLHByYcePvnTBEAwawwapjCPMjy2huw20wc= diff --git a/vendor/github.com/nats-io/nats-server/v2/server/const.go b/vendor/github.com/nats-io/nats-server/v2/server/const.go index ff78445b77..ccf4b3ca5e 100644 --- a/vendor/github.com/nats-io/nats-server/v2/server/const.go +++ b/vendor/github.com/nats-io/nats-server/v2/server/const.go @@ -58,7 +58,7 @@ func init() { const ( // VERSION is the current version for the server. - VERSION = "2.11.0" + VERSION = "2.11.1" // PROTO is the currently supported protocol. // 0 was the original diff --git a/vendor/github.com/nats-io/nats-server/v2/server/jetstream.go b/vendor/github.com/nats-io/nats-server/v2/server/jetstream.go index 1dff7f2bd9..7f1a83ebd7 100644 --- a/vendor/github.com/nats-io/nats-server/v2/server/jetstream.go +++ b/vendor/github.com/nats-io/nats-server/v2/server/jetstream.go @@ -2315,7 +2315,7 @@ func (js *jetStream) checkBytesLimits(selectedLimits *JetStreamAccountLimits, ad return NewJSMemoryResourcesExceededError() } // Check if this server can handle request. - if checkServer && js.memReserved+addBytes > js.config.MaxMemory { + if checkServer && js.memReserved+totalBytes > js.config.MaxMemory { return NewJSMemoryResourcesExceededError() } case FileStorage: @@ -2324,7 +2324,7 @@ func (js *jetStream) checkBytesLimits(selectedLimits *JetStreamAccountLimits, ad return NewJSStorageResourcesExceededError() } // Check if this server can handle request. - if checkServer && js.storeReserved+addBytes > js.config.MaxStore { + if checkServer && js.storeReserved+totalBytes > js.config.MaxStore { return NewJSStorageResourcesExceededError() } } diff --git a/vendor/github.com/nats-io/nats-server/v2/server/jetstream_api.go b/vendor/github.com/nats-io/nats-server/v2/server/jetstream_api.go index 3d9882ad82..555678a8f0 100644 --- a/vendor/github.com/nats-io/nats-server/v2/server/jetstream_api.go +++ b/vendor/github.com/nats-io/nats-server/v2/server/jetstream_api.go @@ -2526,6 +2526,9 @@ func (s *Server) jsLeaderServerRemoveRequest(sub *subscription, c *client, _ *Ac s.Warnf(badAPIRequestT, msg) return } + if acc != s.SystemAccount() { + return + } js, cc := s.getJetStreamCluster() if js == nil || cc == nil || cc.meta == nil { @@ -2650,6 +2653,10 @@ func (s *Server) jsLeaderServerStreamMoveRequest(sub *subscription, c *client, _ accName := tokenAt(subject, 6) streamName := tokenAt(subject, 7) + if acc.GetName() != accName && acc != s.SystemAccount() { + return + } + var resp = JSApiStreamUpdateResponse{ApiResponse: ApiResponse{Type: JSApiStreamUpdateResponseType}} var req JSApiMetaServerStreamMoveRequest @@ -2807,6 +2814,10 @@ func (s *Server) jsLeaderServerStreamCancelMoveRequest(sub *subscription, c *cli accName := tokenAt(subject, 6) streamName := tokenAt(subject, 7) + if acc.GetName() != accName && acc != s.SystemAccount() { + return + } + targetAcc, ok := s.accounts.Load(accName) if !ok { resp.Error = NewJSNoAccountError() @@ -2893,6 +2904,9 @@ func (s *Server) jsLeaderAccountPurgeRequest(sub *subscription, c *client, _ *Ac s.Warnf(badAPIRequestT, msg) return } + if acc != s.SystemAccount() { + return + } js := s.getJetStream() if js == nil { diff --git a/vendor/github.com/nats-io/nats-server/v2/server/stream.go b/vendor/github.com/nats-io/nats-server/v2/server/stream.go index bf70f5c424..6a97e937e0 100644 --- a/vendor/github.com/nats-io/nats-server/v2/server/stream.go +++ b/vendor/github.com/nats-io/nats-server/v2/server/stream.go @@ -6303,6 +6303,10 @@ func (a *Account) RestoreStream(ncfg *StreamConfig, r io.Reader) (*stream, error if err != nil { return nil, err } + js := jsa.js + if js == nil { + return nil, NewJSNotEnabledForAccountError() + } cfg, apiErr := s.checkStreamCfg(ncfg, a, false) if apiErr != nil { @@ -6337,6 +6341,22 @@ func (a *Account) RestoreStream(ncfg *StreamConfig, r io.Reader) (*stream, error } sdirCheck := filepath.Clean(sdir) + string(os.PathSeparator) + _, isClustered := jsa.jetStreamAndClustered() + jsa.usageMu.RLock() + selected, tier, hasTier := jsa.selectLimits(cfg.Replicas) + jsa.usageMu.RUnlock() + reserved := int64(0) + if hasTier { + if isClustered { + js.mu.RLock() + _, reserved = tieredStreamAndReservationCount(js.cluster.streams[a.Name], tier, &cfg) + js.mu.RUnlock() + } else { + reserved = jsa.tieredReservation(tier, &cfg) + } + } + + var bc int64 tr := tar.NewReader(s2.NewReader(r)) for { hdr, err := tr.Next() @@ -6349,6 +6369,13 @@ func (a *Account) RestoreStream(ncfg *StreamConfig, r io.Reader) (*stream, error if hdr.Typeflag != tar.TypeReg { return nil, logAndReturnError() } + bc += hdr.Size + js.mu.RLock() + err = js.checkAllLimits(&selected, &cfg, reserved, bc) + js.mu.RUnlock() + if err != nil { + return nil, err + } fpath := filepath.Join(sdir, filepath.Clean(hdr.Name)) if !strings.HasPrefix(fpath, sdirCheck) { return nil, logAndReturnError() diff --git a/vendor/modules.txt b/vendor/modules.txt index 13ddcd0730..18cd557f69 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -993,7 +993,7 @@ github.com/munnerz/goautoneg # github.com/nats-io/jwt/v2 v2.7.3 ## explicit; go 1.22 github.com/nats-io/jwt/v2 -# github.com/nats-io/nats-server/v2 v2.11.0 +# github.com/nats-io/nats-server/v2 v2.11.1 ## explicit; go 1.23.0 github.com/nats-io/nats-server/v2/conf github.com/nats-io/nats-server/v2/internal/fastrand