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.

Sign up for GitHub

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

Jump to bottom

Only check ack floor if we are interest policy based. #4206

Merged
merged 1 commit into from
Jun 2, 2023
Merged

Only check ack floor if we are interest policy based. #4206

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 16 additions & 3 deletions server/consumer.go
View file
Open in desktop
Expand Up @@ -3315,12 +3315,25 @@ func (o *consumer) checkAckFloor() {
func (o *consumer) processInboundAcks(qch chan struct{}) {
// Grab the server lock to watch for server quit.
o.mu.RLock()
s := o.srv
s, mset := o.srv, o.mset
hasInactiveThresh := o.cfg.InactiveThreshold > 0
o.mu.RUnlock()

if s == nil || mset == nil {
return
}

// Track if we are interest retention policy, if not we can skip the ack floor check.
isInterestRetention := mset.isInterestRetention()

checkAckFloor := func() {
if isInterestRetention {
o.checkAckFloor()
}
}

// We will check this on entry and periodically.
o.checkAckFloor()
checkAckFloor()

// How often we will check for ack floor drift.
var ackFloorCheck = 30 * time.Second
Expand All @@ -3339,7 +3352,7 @@ func (o *consumer) processInboundAcks(qch chan struct{}) {
o.suppressDeletion()
}
case <-time.After(ackFloorCheck):
o.checkAckFloor()
checkAckFloor()
case <-qch:
return
case <-s.quitCh:
Expand Down