[FIXED] Stream recovery with corrupt msg block with sequence gaps. #4344
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
…ce holes. The stream had max msgs per subject of one and only one subject but had lots of messages. The stream did not recover correctly, and upon further inspection determined that a msg blk had holes, which should not be possible. We now detect the holes and deal with the situation appropriately. Heavily tested on the data dump from the field. Signed-off-by: Derek Collison <derek@nats.io>
neilalexander
approved these changes
Jul 28, 2023
server/filestore.go
Outdated
| @@ -4055,23 +4090,39 @@ func (mb *msgBlock) indexCacheBuf(buf []byte) error { | |||
| dlen := int(rl) - msgHdrSize | |||
|
|
|||
| // Do some quick sanity checks here. | |||
| if dlen < 0 || int(slen) > dlen || dlen > int(rl) || index+rl > lbuf || rl > 32*1024*1024 { | |||
| if dlen < 0 || int(slen) > (dlen-8) || dlen > int(rl) || index+rl > lbuf || rl > rlBadThresh { | |||
There was a problem hiding this comment.
Might be worth commenting what the 8 is for, otherwise it's just a magic number
There was a problem hiding this comment.
Will add in const.
Signed-off-by: Derek Collison <derek@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.
This is a fix for a bad msg blk detected in the field that had sequence holes.
The stream had max msgs per subject of one and only one subject but had lots of messages. The stream did not recover correctly, and upon further inspection determined that a msg blk had holes, which should not be possible.
We now detect the holes and deal with the situation appropriately. Heavily tested on the data dump from the field.
Signed-off-by: Derek Collison derek@nats.io