diff options
| author | matt dannenberg <matt.dannenberg@10gen.com> | 2013-08-02 13:42:31 -0400 |
|---|---|---|
| committer | matt dannenberg <matt.dannenberg@10gen.com> | 2013-08-05 14:52:28 -0400 |
| commit | 4c1e37975ab551e02b1b3f6d9902302666f3b4af (patch) | |
| tree | ecee48c38ea94bcc4ef941efa778d62dcc63118e /src/mongo/db/repl/oplogreader.h | |
| parent | be395711165d0bc1d96bcb51fb5b3586032d8f9a (diff) | |
| download | mongo-4c1e37975ab551e02b1b3f6d9902302666f3b4af.tar.gz | |
SERVER-6071 pass 'me' object to oplogreader instead of getting from database in a way that causes a deadlock
Diffstat (limited to 'src/mongo/db/repl/oplogreader.h')
| -rw-r--r-- | src/mongo/db/repl/oplogreader.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mongo/db/repl/oplogreader.h b/src/mongo/db/repl/oplogreader.h index a4672461935..6b74d5be2f9 100644 --- a/src/mongo/db/repl/oplogreader.h +++ b/src/mongo/db/repl/oplogreader.h @@ -32,10 +32,9 @@ namespace mongo { class OplogReader { shared_ptr<DBClientConnection> _conn; shared_ptr<DBClientCursor> cursor; - bool _doHandshake; int _tailingQueryOptions; public: - OplogReader( bool doHandshake = true ); + OplogReader(); ~OplogReader() { } void resetCursor() { cursor.reset(); } void resetConnection() { @@ -56,6 +55,8 @@ namespace mongo { /* ok to call if already connected */ bool connect(const std::string& hostname); + bool connect(const std::string& hostname, const BSONObj& me); + bool connect(const mongo::OID& rid, const int from, const string& to); void tailCheck() { |