Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIXED] o.chkflr must not be greater than o.asflr+1 #6146

Merged
merged 1 commit into from
Nov 20, 2024

Conversation

MauriceVanVeen
Copy link
Member

@MauriceVanVeen MauriceVanVeen commented Nov 19, 2024

o.chkflr was set to be too high, whereas it should never be higher than o.asflr+1. If o.chkflr > o.asflr+1 we're not able to retry acking messages until o.asflr is upped.

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

@MauriceVanVeen MauriceVanVeen requested a review from a team as a code owner November 19, 2024 11:52
server/stream.go Outdated Show resolved Hide resolved
server/consumer.go Outdated Show resolved Hide resolved
server/consumer.go Outdated Show resolved Hide resolved
Copy link
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

@MauriceVanVeen MauriceVanVeen force-pushed the maurice/fix-chkfloor branch 2 times, most recently from 4c3bcdf to 9410103 Compare November 20, 2024 08:44
@MauriceVanVeen MauriceVanVeen marked this pull request as draft November 20, 2024 17:01
@MauriceVanVeen MauriceVanVeen changed the title [FIXED] o.chkflr must not be greater than o.asflr & allow retries when removing messages in mset.ackMsg [FIXED] o.chkflr must not be greater than o.asflr+1 Nov 20, 2024
Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
@MauriceVanVeen MauriceVanVeen marked this pull request as ready for review November 20, 2024 18:19
@MauriceVanVeen
Copy link
Member Author

@derekcollison, removed the retry floor from this PR, this is ready for review again.

@derekcollison derekcollison self-requested a review November 20, 2024 18:57
Copy link
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

@derekcollison derekcollison merged commit 869d3ad into main Nov 20, 2024
5 checks passed
@derekcollison derekcollison deleted the maurice/fix-chkfloor branch November 20, 2024 19:00
MauriceVanVeen pushed a commit that referenced this pull request Nov 21, 2024
`o.chkflr` was set to be too high, whereas it should never be higher
than `o.asflr+1`. If `o.chkflr > o.asflr+1` we're not able to retry
acking messages until `o.asflr` is upped.

Signed-off-by: Maurice van Veen <github@mauricevanveen.com>
neilalexander added a commit that referenced this pull request Nov 22, 2024
Includes:

- #6147
- #6150
- #6151
- #6153
- #6154
- #6146
- #6139
- #6152
- #6157
- #6161

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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants