summaryrefslogtreecommitdiff
path: root/src/mongo/db/repl/rs_rollback.cpp
diff options
context:
space:
mode:
authorKaloian Manassiev <kaloian.manassiev@mongodb.com>2014-06-28 12:21:39 -0400
committerKaloian Manassiev <kaloian.manassiev@mongodb.com>2014-06-28 12:21:39 -0400
commit89fcbab94c7103105e8c72f654a5774a066bdb90 (patch)
tree5dccab74eaf78f104c8bbbbb869eed0374ecd02b /src/mongo/db/repl/rs_rollback.cpp
parent52edab726185cbba1401cb46de221fb3d1cb0408 (diff)
downloadmongo-89fcbab94c7103105e8c72f654a5774a066bdb90.tar.gz
Revert "SERVER-13961 Add OperationContext argument to Client::Context"
This reverts commit 52edab726185cbba1401cb46de221fb3d1cb0408.
Diffstat (limited to 'src/mongo/db/repl/rs_rollback.cpp')
-rw-r--r--src/mongo/db/repl/rs_rollback.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/db/repl/rs_rollback.cpp b/src/mongo/db/repl/rs_rollback.cpp
index 19a2b70fbf7..985d751aa8e 100644
--- a/src/mongo/db/repl/rs_rollback.cpp
+++ b/src/mongo/db/repl/rs_rollback.cpp
@@ -230,7 +230,7 @@ namespace repl {
int getRBID(DBClientConnection*);
static void syncRollbackFindCommonPoint(OperationContext* txn, DBClientConnection* them, FixUpInfo& fixUpInfo) {
- Client::Context ctx(txn, rsoplog);
+ Client::Context ctx(rsoplog);
boost::scoped_ptr<Runner> runner(
InternalPlanner::collectionScan(rsoplog,
@@ -499,13 +499,13 @@ namespace repl {
for (set<string>::iterator it = fixUpInfo.toDrop.begin();
it != fixUpInfo.toDrop.end();
it++) {
- Client::Context ctx(txn, *it);
+ Client::Context ctx(*it);
log() << "replSet rollback drop: " << *it << rsLog;
ctx.db()->dropCollection(txn, *it);
}
sethbmsg("rollback 4.7");
- Client::Context ctx(txn, rsoplog);
+ Client::Context ctx(rsoplog);
Collection* oplogCollection = ctx.db()->getCollection(txn, rsoplog);
uassert(13423,
str::stream() << "replSet error in rollback can't find " << rsoplog,
@@ -543,7 +543,7 @@ namespace repl {
removeSaver.reset(new Helpers::RemoveSaver("rollback", "", doc.ns));
// todo: lots of overhead in context, this can be faster
- Client::Context ctx(txn, doc.ns);
+ Client::Context ctx(doc.ns);
// Add the doc to our rollback file
BSONObj obj;