diff options
author | Dwight <dwight@10gen.com> | 2011-12-19 15:20:05 -0500 |
---|---|---|
committer | Dwight <dwight@10gen.com> | 2011-12-19 15:21:11 -0500 |
commit | 9e96a4a1a16c2ab4a4d8a64a2f2ac1a45bbd379c (patch) | |
tree | 1425ce7e65ab5c9d7d01c727d1647ee832a52b46 /db/repl/rs_rollback.cpp | |
parent | 32f6e84c12607686ef228adfeddd5cdc1e17726e (diff) | |
download | mongo-9e96a4a1a16c2ab4a4d8a64a2f2ac1a45bbd379c.tar.gz |
begin the process of putting global vairables in one central location. in particular, d_globals.h for mongod.
this surfaced some things such as references to dbMutex from things that don't actually use it, which resulted
in more changes to clean those up
Diffstat (limited to 'db/repl/rs_rollback.cpp')
-rw-r--r-- | db/repl/rs_rollback.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/db/repl/rs_rollback.cpp b/db/repl/rs_rollback.cpp index b1937e0a32e..10727c59669 100644 --- a/db/repl/rs_rollback.cpp +++ b/db/repl/rs_rollback.cpp @@ -200,7 +200,7 @@ namespace mongo { } last = time(0); - assert( dbMutex.atLeastReadLocked() ); + assert( d.dbMutex.atLeastReadLocked() ); Client::Context c(rsoplog); NamespaceDetails *nsd = nsdetails(rsoplog); assert(nsd); @@ -377,7 +377,7 @@ namespace mongo { assert( !h.commonPointOurDiskloc.isNull() ); - dbMutex.assertWriteLocked(); + mongo::d.dbMutex.assertWriteLocked(); /* we have items we are writing that aren't from a point-in-time. thus best not to come online until we get to that point in freshness. */ @@ -593,7 +593,7 @@ namespace mongo { unsigned ReplSetImpl::_syncRollback(OplogReader&r) { assert( !lockedByMe() ); - assert( !dbMutex.atLeastReadLocked() ); + assert( !d.dbMutex.atLeastReadLocked() ); sethbmsg("rollback 0"); |