Skip to content

Comments

Various filestore fixes#7816

Merged
neilalexander merged 17 commits intomainfrom
maurice/fs-fixes
Feb 11, 2026
Merged

Various filestore fixes#7816
neilalexander merged 17 commits intomainfrom
maurice/fs-fixes

Conversation

@MauriceVanVeen
Copy link
Member

@MauriceVanVeen MauriceVanVeen commented Feb 11, 2026

Fixes various issues from locks not being unlocked, wrong checksum being copied for a compressed block during truncate, some race conditions due to not holding locks for long enough, requiring recalculation of ss.Last since it's lazy, non-atomic loads of mb.first/last.seq, and a potential panic that could happen if the disk was corrupted such that hbit was set on the record length (marking the message has headers) but the message not actually having headers (although probably unlikely to hit in practice).

Signed-off-by: Maurice van Veen github@mauricevanveen.com

@MauriceVanVeen
[FIXED] Checksum after truncate when compressed/encrypted
d957293 
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
@MauriceVanVeen
[FIXED] Lock leak on error for consumer if encrypted
ea1c1a9 
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
@MauriceVanVeen
[FIXED] Lock leak on error in PurgeEx/Compact/Truncate
6172909 
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
@MauriceVanVeen
[IMPROVED] Remove redundant/incorrect TTL/schedule accounting in mb r…
7f44b4d 
…ebuild

Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
@MauriceVanVeen
Test: cacheSize/cacheLoads mb requires write/read lock
89bbc29 
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
@MauriceVanVeen
[FIXED] Filestore write lock held with encryption during snapshot
7d5e594 
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
@MauriceVanVeen
[FIXED] Filestore lock held when adjusting psim fblk
d7ba3b7 
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
@MauriceVanVeen
[IMPROVED] Ensure NumPending(Multi) can't underflow
b7f70f6 
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
@MauriceVanVeen
[FIXED] Load last seq/msg with lazy subject state
72c0511 
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
@MauriceVanVeen
[FIXED] filterIsAll requires both slices sorted
4f399ec 
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
@MauriceVanVeen
[FIXED] Filestore uses atomic.LoadUint64 consistently
e85acff 
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
@MauriceVanVeen
[FIXED] Use mb read lock in SkipMsgs
d1c6780 
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
@MauriceVanVeen
[FIXED] SubjectForSeq requires copied subject string
ef738fa 
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
@MauriceVanVeen
[FIXED] Message block buffer not recycled
43e83be 
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
@MauriceVanVeen
[FIXED] Potential panic after corruption set hbit
5d43ec4 
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
@MauriceVanVeen
[IMPROVED] OriginalSize reflects non-compressed size
6ffda75 
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
@MauriceVanVeen
[FIXED] Use no copy when removing message, but copy subject when needed
d2d1fc9 
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
@MauriceVanVeen MauriceVanVeen requested a review from a team as a code owner February 11, 2026 10:12
neilalexander
neilalexander approved these changes Feb 11, 2026
View reviewed changes
Copy link
Member

@neilalexander neilalexander 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 7900231 into main Feb 11, 2026
48 checks passed
@neilalexander neilalexander deleted the maurice/fs-fixes branch February 11, 2026 10:37
wallyqs pushed a commit to wallyqs/nats-server that referenced this pull request Feb 11, 2026
@claude
Add detailed review of PR nats-io#7816 (Various filestore fixes)
2a959b4 
Review covers 15 distinct fixes across filestore/memstore:
lock safety, data integrity, use-after-free, lazy state
recalculation, arithmetic underflow, and atomic access.

https://claude.ai/code/session_01PgNhxkzN4uLt5yzuLBuWri
@neilalexander neilalexander mentioned this pull request Feb 16, 2026
Merged
neilalexander added a commit that referenced this pull request Feb 16, 2026
@neilalexander
Cherry-picks for 2.12.5-RC.1 (#7836)
5450202 
Includes the following:

- #7780
- #7784
- #7782
- #7783
- #7787
- #7789
- #7793
- #7797
- #7798
- #7799
- #7790
- #7805
- #7810
- #7811
- #7812
- #7809
- #7724
- #7815
- #7816
- #7818
- #7819
- #7820
- #7795
- #7825
- #7828
- #7835
- #7837

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

Reviewers

@neilalexander neilalexander neilalexander approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@MauriceVanVeen @neilalexander