Cherry-picks for 2.10.25-RC.1 #6345
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
…ons on hub If the hub has a user with subscribe permissions on a literal subject that the leaf is trying to create a queue subscription on, the interest may not be propagated. The issue was caused by the fact that we were checking the permissions on the key (that includes subject and queue name) instead of the subject itself. Resolves #6281 Signed-off-by: Ivan Kozlovic <ivan@synadia.com>
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.28.0 to 0.29.0. - [Commits](golang/sys@v0.28.0...v0.29.0) --- updated-dependencies: - dependency-name: golang.org/x/sys dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [golang.org/x/time](https://github.com/golang/time) from 0.8.0 to 0.9.0. - [Commits](golang/time@v0.8.0...v0.9.0) --- updated-dependencies: - dependency-name: golang.org/x/time dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
…nt proposals Signed-off-by: Neil Twigg <neil@nats.io>
None of these are ever mutated after the group is created, therefore we will create unnecessary lock contention on the group lock by trying to take it. Signed-off-by: Neil Twigg <neil@nats.io>
Otherwise consumer infos could hold the JS lock while waiting to take the Raft lock for a group. Signed-off-by: Neil Twigg <neil@nats.io>
…in create consumer Signed-off-by: Neil Twigg <neil@nats.io>
…shot/restore advisories Otherwise these advisories can end up very large and take more CPU time to encode. Signed-off-by: Neil Twigg <neil@nats.io>
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
Signed-off-by: Waldemar Quevedo <wally@nats.io>
wallyqs
force-pushed
the
downstream/v2.10.25
branch
from
240fce9 to
14db100
Compare
|
@neilalexander #6282 and #6284 use some built-ins from v2.11 like unmarshalRequest etc... so will leave them out for now, but including the latest two |
Signed-off-by: Neil Twigg <neil@nats.io>
Since `deleteNotActive` already runs in its own goroutine via `time.AfterFunc`, we just create more work for the scheduler by having extra goroutines running on top of that. Signed-off-by: Neil Twigg <neil@nats.io>
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
Signed-off-by: Waldemar Quevedo <wally@nats.io>
Need to capture `rg.node` while the JetStream lock is held, otherwise stopping an asset could race and it could be set back to `nil`. Signed-off-by: Neil Twigg <neil@nats.io>
Similar fix to #4533, but extending to some other clustered tests, as well as one super cluster test. Should prevent these tests from failing with `JetStream not enabled for account`. Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
Could take some time for `o.processStreamSignal` to be called and up `o.npc`. Without would sometimes fail with `jetstream_test.go:24773: require int64 equal, but got: 0 != 1`. Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
`TestJetStreamClusterRedeliverBackoffs` would sometimes fail, even though it would be very close to the intended backoff: ``` jetstream_cluster_2_test.go:4216: Timing is off for 1, expected ~100ms, but got 99.846642ms jetstream_cluster_2_test.go:4216: Timing is off for 0, expected ~25ms, but got 50.767748ms jetstream_cluster_2_test.go:4216: Timing is off for 4, expected ~250ms, but got 249.95211ms ``` Allowing for a bit of leeway on both ends. Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
…nge (#6332) Calling `require_NoError` in a `checkFor` immediately fails the test and doesn't allow for retries. Also up the max timeout when doing stepdowns, as that might sometimes take longer as well. Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
Ack state could take some time to propagate, since the sent acks are not synchronous. Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
Should solve this data race, where `rn.updateLeader(noLeader)` was
called without holding the lock.
```
==================
WARNING: DATA RACE
Write at 0x00c0011d6da8 by goroutine 238071:
github.com/nats-io/nats-server/v2/server.(*raft).updateLeader()
/home/travis/build/nats-io/nats-server/server/raft.go:3212 +0x1fa
github.com/nats-io/nats-server/v2/server.TestJetStreamClusterDesyncAfterErrorDuringCatchup.func2()
/home/travis/build/nats-io/nats-server/server/jetstream_cluster_4_test.go:3970 +0x1f2
github.com/nats-io/nats-server/v2/server.TestJetStreamClusterDesyncAfterErrorDuringCatchup.func3()
/home/travis/build/nats-io/nats-server/server/jetstream_cluster_4_test.go:4046 +0xc56
testing.tRunner()
/home/travis/sdk/go1.23.3/src/testing/testing.go:1690 +0x226
testing.(*T).Run.gowrap1()
/home/travis/sdk/go1.23.3/src/testing/testing.go:1743 +0x44
Previous read at 0x00c0011d6da8 by goroutine 238374:
github.com/nats-io/nats-server/v2/server.(*raft).processAppendEntry()
/home/travis/build/nats-io/nats-server/server/raft.go:3351 +0x124c
github.com/nats-io/nats-server/v2/server.(*raft).processAppendEntries()
/home/travis/build/nats-io/nats-server/server/raft.go:2029 +0x1f2
github.com/nats-io/nats-server/v2/server.(*raft).runAsFollower()
/home/travis/build/nats-io/nats-server/server/raft.go:2044 +0x446
github.com/nats-io/nats-server/v2/server.(*raft).run()
/home/travis/build/nats-io/nats-server/server/raft.go:1906 +0x557
github.com/nats-io/nats-server/v2/server.(*raft).run-fm()
<autogenerated>:1 +0x33
github.com/nats-io/nats-server/v2/server.(*Server).startGoRoutine.func1()
/home/travis/build/nats-io/nats-server/server/server.go:3885 +0x59
```
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
This ensures that we stop these goroutines more quickly when either the server or the JetStream system shuts down. This also avoids a race in `TestJetStreamClusterGhostEphemeralsAfterRestart`, as the unit test was reverting a modified constant before these goroutines would have finished in some cases. Signed-off-by: Neil Twigg <neil@nats.io>
Signed-off-by: Neil Twigg <neil@nats.io>
Signed-off-by: Neil Twigg <neil@nats.io>
Signed-off-by: Neil Twigg <neil@nats.io>
Signed-off-by: Neil Twigg <neil@nats.io>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Dependencies
Leafnode
JetStream
ss.Lastup-to-date #6235clfs=0, don't snapshot very often #6277ClientInfofields from stream & consumer assignment proposals #6326$JS.EVENT.ADVISORY.APIand stream snapshot/restore advisories #6338deleteNotActive#6344deleteNotActivestops on JetStream or server shutdown #6351popOnein JS API routed request workers #6355Tests