Skip to content

Filestore fixes#7295

Merged
neilalexander merged 3 commits intomainfrom
neil/fsfixes
Sep 10, 2025
Merged

Filestore fixes#7295
neilalexander merged 3 commits intomainfrom
neil/fsfixes

Conversation

@neilalexander
Copy link
Copy Markdown
Member

@neilalexander neilalexander commented Sep 10, 2025

This PR fixes the following filestore bugs:

  • flushPendingMsgsLocked could, in some cases, hold onto a buffer after returning it to the pool, which could result in corruption
  • flushPendingMsgsLocked was not making best use of reused buffers as the head of the buffer was left as "dead space" rather than reclaiming it
  • loadMsgsWithLock would incorrectly report failing to load the cache as though there is corruption

Signed-off-by: Neil Twigg neil@nats.io

@neilalexander
Fix use-after-pool bug in flushPendingMsgsLocked
601b04e 
Signed-off-by: Neil Twigg <neil@nats.io>
@neilalexander
Improve buffer reuse logic in flushPendingMsgsLocked
bdb5cf6 
Signed-off-by: Neil Twigg <neil@nats.io>
@neilalexander
Return errNoCache instead of errCorruptState when failing to hydr…
b61c85d 
…ate cache in `loadMsgsWithLock`

Signed-off-by: Neil Twigg <neil@nats.io>
derekcollison
derekcollison approved these changes Sep 10, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@derekcollison derekcollison 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 marked this pull request as ready for review September 10, 2025 16:25
@neilalexander neilalexander requested a review from a team as a code owner September 10, 2025 16:25
@neilalexander neilalexander merged commit 35f5d52 into main Sep 10, 2025
90 of 92 checks passed
@neilalexander neilalexander deleted the neil/fsfixes branch September 10, 2025 16:34
@neilalexander neilalexander mentioned this pull request Sep 29, 2025
Merged
neilalexander added a commit that referenced this pull request Sep 29, 2025
@neilalexander
Cherry-picks for v2.11.10-RC.1 (#7370)
ada4e68 
Includes the following:

- #7290
- #7295
- #7291
- #7287
- #7299
- #7300
- #7297
- #7303
- #7304
- #7305
- #7309
- #7307
- #7320
- #7337
- #7344
- #7345
- #7348
- #7349
- #7350
- #7357
- #7356
- #7358
- #7367
- #7293

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

@derekcollison derekcollison derekcollison 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

@neilalexander @derekcollison