CBG-4928 do not log warning for closed blip sender #7878
+1
−1
Conversation
This file contains hidden or 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
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR addresses a false alarm in logging when BLIP connections close normally during replication by filtering out expected errors from closed BLIP senders.
- Prevents warning logs when BLIP sender closes during normal network disconnections
- Adds error filtering to avoid invoking fatal error callbacks for expected closed sender errors
| // Spawn a goroutine to await the client's response: | ||
| go func(bh *blipHandler, sender *blip.Sender, response *blip.Message, changeArray [][]any, sendTime time.Time, dbCollection *DatabaseCollectionWithUser) { | ||
| if err := bh.handleChangesResponse(bh.loggingCtx, sender, response, changeArray, sendTime, dbCollection, bh.collectionIdx); err != nil { | ||
| if err := bh.handleChangesResponse(bh.loggingCtx, sender, response, changeArray, sendTime, dbCollection, bh.collectionIdx); err != nil && !errors.Is(err, ErrClosedBLIPSender) { |
There was a problem hiding this comment.
[nitpick] The condition is now complex with multiple checks on a single line. Consider extracting the error check to a separate variable for improved readability: if err := bh.handleChangesResponse(...); err != nil { if !errors.Is(err, ErrClosedBLIPSender) { ... } }
RIT3shSapata
approved these changes
Nov 14, 2025
6 tasks
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.
CBG-4928 do not log warning for closed blip sender
This should prevent a log message as below when a blip connection is closed and it can not longer send changes. I believe a blip connection could be closed due to normal network disconnections:
It is OK to not enter fatalErrorCallback
sync_gateway/db/active_replicator_push.go
Lines 211 to 213 in b8b689b
This was hard to unit test, but is observed in real world logs, so pushing this change to avoid unexpected logs. In order to test this, I believe you have to have the sender closed at the right time.
NOTE: this is only one part of CBG-4928 and there is a second part needed to address: