diff options
| author | Antonin Kral <a.kral@bobek.cz> | 2011-06-18 21:24:54 +0200 |
|---|---|---|
| committer | Antonin Kral <a.kral@bobek.cz> | 2011-06-18 21:24:54 +0200 |
| commit | fefb1e355f6cbe35160f2f73ed68a38d95fa59a2 (patch) | |
| tree | faecb2fb6677516c5f6d9edfae8475344ddd73ed /client/dbclient_rs.h | |
| parent | d95b46b2bbb5b4246213f252010508489b4e5719 (diff) | |
| parent | 64b33ee522375a8dc15be2875dfb7db4502259b0 (diff) | |
| download | mongodb-fefb1e355f6cbe35160f2f73ed68a38d95fa59a2.tar.gz | |
Merge commit 'upstream/1.8.2'
Diffstat (limited to 'client/dbclient_rs.h')
| -rw-r--r-- | client/dbclient_rs.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/dbclient_rs.h b/client/dbclient_rs.h index fca6e6e..e942d7b 100644 --- a/client/dbclient_rs.h +++ b/client/dbclient_rs.h @@ -124,6 +124,7 @@ namespace mongo { bool _checkConnection( DBClientConnection * c , string& maybePrimary , bool verbose ); int _find( const string& server ) const ; + int _find_inlock( const string& server ) const ; int _find( const HostAndPort& server ) const ; mutable mongo::mutex _lock; // protects _nodes @@ -147,7 +148,7 @@ namespace mongo { vector<Node> _nodes; int _master; // which node is the current master. -1 means no master is known - + int _nextSlave; // which node is the current slave static mongo::mutex _setsLock; // protects _sets static map<string,ReplicaSetMonitorPtr> _sets; // set name to Monitor |