CDRIVER-594 fix all the SS/SDAM timers #213
Merged
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
| @@ -321,8 +349,10 @@ mongoc_topology_select (mongoc_topology_t *topology, | |||
| error); | |||
|
|
|||
| if (! selected_server) { | |||
| /* TODO request an immediate topology check here */ | |||
| r = mongoc_cond_timedwait (&topology->cond_client, &topology->mutex, expire_at - now); | |||
| topology->scan_requested = true; | |||
There was a problem hiding this comment.
we shouldn't have to do this. I just got hung up on the fact that we have the mutex here. It's fine to either have a version of request_scan which assumes we have the lock, or to drop the lock and use request scan, then resume it
o actually lock around ismaster handling in topology o re-use topology_request_scan in select loop
|
LGTM. |
ajdavis
added a commit
that referenced
this pull request
Apr 7, 2015
CDRIVER-594 fix all the SS/SDAM timers
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.
There's a bunch in here.
@ajdavis, mind taking a look to see if the logic is correct?