diff options
| author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2014-07-17 17:03:15 -0400 |
|---|---|---|
| committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2014-07-18 15:16:14 -0400 |
| commit | 3c3d656668e26645492ee3dafb241631352426d4 (patch) | |
| tree | f69bcbf52ad1ef98aba01cdcb61b86f44e34d4ca /src/mongo/db/repl/sync_source_feedback.h | |
| parent | 848999f1527e8390d4d76f9fad0860218b73be4d (diff) | |
| download | mongo-3c3d656668e26645492ee3dafb241631352426d4.tar.gz | |
SERVER-13961 Cleanup some nested instantiations of OperationContextImpl in repl
These are causing deadlocks if LockState is removed from TLS because of
pseudo-conflicting locks on the same code path.
Diffstat (limited to 'src/mongo/db/repl/sync_source_feedback.h')
| -rw-r--r-- | src/mongo/db/repl/sync_source_feedback.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mongo/db/repl/sync_source_feedback.h b/src/mongo/db/repl/sync_source_feedback.h index 3225620afa9..371912b26c8 100644 --- a/src/mongo/db/repl/sync_source_feedback.h +++ b/src/mongo/db/repl/sync_source_feedback.h @@ -36,6 +36,9 @@ #include "mongo/util/log.h" namespace mongo { + + class OperationContext; + namespace repl { class Member; @@ -53,7 +56,7 @@ namespace repl { void associateMember(const OID& rid, Member* member); /// Ensures local.me is populated and populates it if not. - void ensureMe(); + void ensureMe(OperationContext* txn); /// Notifies the SyncSourceFeedbackThread to wake up and send a handshake up the replication /// chain, upon receiving a handshake. |