[3.2.8] CBG-5008: Redo ServerContext lock changes #7913
Merged
+26
−23
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 re-implements locking improvements for the ServerContext's HTTP servers map, specifically addressing concurrency issues from a previous implementation (#7889) while minimizing merge conflicts with the 3.2.8 branch.
Key Changes:
- Introduces a dedicated
_httpServersLockto protect the_httpServersmap instead of using the broadersc.lock - Refactors the
Closemethod to extract HTTP server shutdown logic into a separatestopHTTPServersmethod - Reorders shutdown operations to stop HTTP servers before closing databases
torcolvin
approved these changes
Dec 2, 2025
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-5008
A more targeted re-implementation of #7889 to avoid large number of conflicts around the database maps/code between these versions.
Integration Tests
GSI=true,xattrs=truehttps://jenkins.sgwdev.com/job/SyncGatewayIntegration/0000/