Skip to content

Comments

Cherry-picks for v2.12.4-RC.2#7731

Merged
neilalexander merged 11 commits intorelease/v2.12.4from
backports/v2.12.4-RC.2
Jan 15, 2026
Merged

Cherry-picks for v2.12.4-RC.2#7731
neilalexander merged 11 commits intorelease/v2.12.4from
backports/v2.12.4-RC.2

Conversation

MauriceVanVeen and others added 11 commits January 15, 2026 15:46
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
Method `addStreamWithAssignment` could cause a deadlock when
acquiring the jetStream lock while holding the jsAccount lock,
a lock ordering violation.
This would cause a deadlock when attempting to shutdown and a
a stream was created concurrrently. Easiliy reproduced when
running `BenchmarkJetStreamCreate` benchmark.
The jetstream lock was acquired to protect the following
assignment:

```
        mset.create = sa.Created
```
It appears unnecessary to lock jetstream for that, so the fix
removes the locking.

Signed-off-by: Daniele Sciascia <daniele@nats.io>
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
Expose the expiration dates of all TLS certificates in the varz
monitor endpoint.

Fixes #7684

Signed-off-by: Daniele Sciascia <daniele@nats.io>
[skip ci]

Signed-off-by: Neil Twigg <neil@nats.io>
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
…uncate

Signed-off-by: Neil Twigg <neil@nats.io>
The configuration field was not being copied in `(*Account).shallowCopy()`
and was therefore lost between the config code and the Raft code.

Signed-off-by: Neil Twigg <neil@nats.io>
Signed-off-by: Neil Twigg <neil@nats.io>
@neilalexander neilalexander requested a review from a team as a code owner January 15, 2026 15:48
Copy link
Member

@MauriceVanVeen MauriceVanVeen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@neilalexander neilalexander merged commit 9277357 into release/v2.12.4 Jan 15, 2026
90 of 92 checks passed
@neilalexander neilalexander deleted the backports/v2.12.4-RC.2 branch January 15, 2026 16:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants