summaryrefslogtreecommitdiff
path: root/src/mongo/db/repl/rs_rollback.cpp
diff options
context:
space:
mode:
authorMaria van Keulen <maria@mongodb.com>2017-03-29 15:40:44 -0400
committerMaria van Keulen <maria@mongodb.com>2017-04-06 11:37:56 -0400
commit1cbb67b8acf6c579a8ef99f9b3bf74394bbd11c3 (patch)
tree426da6552cf3bb3315e46f925b0f3071e9979300 /src/mongo/db/repl/rs_rollback.cpp
parent4516cbf1786f35557fe2f2e26e2e25373aa7af83 (diff)
downloadmongo-1cbb67b8acf6c579a8ef99f9b3bf74394bbd11c3.tar.gz
SERVER-28543 Add OperationContext as an argument to getCollection
Diffstat (limited to 'src/mongo/db/repl/rs_rollback.cpp')
-rw-r--r--src/mongo/db/repl/rs_rollback.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mongo/db/repl/rs_rollback.cpp b/src/mongo/db/repl/rs_rollback.cpp
index b17e80c6035..9d6c85faad7 100644
--- a/src/mongo/db/repl/rs_rollback.cpp
+++ b/src/mongo/db/repl/rs_rollback.cpp
@@ -456,7 +456,7 @@ void syncFixUp(OperationContext* opCtx,
Lock::DBLock dbLock(opCtx, nss.db(), MODE_X);
auto db = dbHolder().openDb(opCtx, nss.db().toString());
invariant(db);
- auto collection = db->getCollection(ns);
+ auto collection = db->getCollection(opCtx, nss);
invariant(collection);
auto cce = collection->getCatalogEntry();
@@ -540,7 +540,7 @@ void syncFixUp(OperationContext* opCtx,
// perform a collection scan and write all documents in the collection to disk
std::unique_ptr<PlanExecutor> exec(InternalPlanner::collectionScan(
- opCtx, *it, db->getCollection(*it), PlanExecutor::YIELD_AUTO));
+ opCtx, *it, db->getCollection(opCtx, *it), PlanExecutor::YIELD_AUTO));
BSONObj curObj;
PlanExecutor::ExecState execState;
while (PlanExecutor::ADVANCED == (execState = exec->getNext(&curObj, NULL))) {
@@ -582,7 +582,7 @@ void syncFixUp(OperationContext* opCtx,
if (!db) {
continue;
}
- auto collection = db->getCollection(nss.toString());
+ auto collection = db->getCollection(opCtx, nss);
if (!collection) {
continue;
}
@@ -640,7 +640,7 @@ void syncFixUp(OperationContext* opCtx,
Lock::DBLock docDbLock(opCtx, docNss.db(), MODE_X);
OldClientContext ctx(opCtx, doc.ns);
- Collection* collection = ctx.db()->getCollection(doc.ns);
+ Collection* collection = ctx.db()->getCollection(opCtx, docNss);
// Add the doc to our rollback file if the collection was not dropped while
// rolling back createCollection operations.
@@ -758,7 +758,7 @@ void syncFixUp(OperationContext* opCtx,
Lock::DBLock oplogDbLock(opCtx, oplogNss.db(), MODE_IX);
Lock::CollectionLock oplogCollectionLoc(opCtx->lockState(), oplogNss.ns(), MODE_X);
OldClientContext ctx(opCtx, rsOplogName);
- Collection* oplogCollection = ctx.db()->getCollection(rsOplogName);
+ Collection* oplogCollection = ctx.db()->getCollection(opCtx, oplogNss);
if (!oplogCollection) {
fassertFailedWithStatusNoTrace(13423,
Status(ErrorCodes::UnrecoverableRollbackError,