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/sync_source_feedback.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/sync_source_feedback.h')
| -rw-r--r-- | src/mongo/db/repl/sync_source_feedback.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/repl/sync_source_feedback.h b/src/mongo/db/repl/sync_source_feedback.h index 183e66e5994..dc9b17ad2b1 100644 --- a/src/mongo/db/repl/sync_source_feedback.h +++ b/src/mongo/db/repl/sync_source_feedback.h @@ -29,7 +29,7 @@ namespace mongo { public: SyncSourceFeedback() : BackgroundJob(false /*don't selfdelete*/), _syncTarget(NULL), - _oplogReader(new OplogReader(true)), + _oplogReader(new OplogReader()), _supportsUpdater(false) {} ~SyncSourceFeedback() { @@ -83,7 +83,7 @@ namespace mongo { * does not support the update command. */ bool connectOplogReader(const std::string& hostName) { - return _oplogReader->connect(hostName); + return _oplogReader->connect(hostName, _me); } bool connect(const mongo::OID& rid, const int from, const string& to) { |