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/index_rebuilder.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/index_rebuilder.h')
| -rw-r--r-- | src/mongo/db/index_rebuilder.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mongo/db/index_rebuilder.h b/src/mongo/db/index_rebuilder.h index bf008f59b39..71e8bd55952 100644 --- a/src/mongo/db/index_rebuilder.h +++ b/src/mongo/db/index_rebuilder.h @@ -35,6 +35,8 @@ namespace mongo { + class OperationContext; + // This is a job that's only run at startup. It finds all incomplete indices and // finishes rebuilding them. After they complete rebuilding, the thread terminates. class IndexRebuilder : public BackgroundJob { @@ -49,7 +51,7 @@ namespace mongo { * Check each collection in the passed in list to see if it has any in-progress index * builds that need to be retried. If so, calls retryIndexBuild. */ - void checkNS(const std::list<std::string>& nsToCheck); + void checkNS(OperationContext* txn, const std::list<std::string>& nsToCheck); }; extern IndexRebuilder indexRebuilder; |