summaryrefslogtreecommitdiff
path: root/src/mongo/db/s/config/configsvr_merge_chunk_command.cpp
diff options
context:
space:
mode:
authorMaria van Keulen <maria@mongodb.com>2017-03-07 12:00:08 -0500
committerMaria van Keulen <maria@mongodb.com>2017-03-07 12:00:08 -0500
commit589a5c169ced8f6e9ddcd3d182ae1b75db6b7d79 (patch)
treec7a090ffdd56a91ae677e2492c61b820af44f964 /src/mongo/db/s/config/configsvr_merge_chunk_command.cpp
parent3cba97198638df3750e3b455e2ad57af7ee536ae (diff)
downloadmongo-589a5c169ced8f6e9ddcd3d182ae1b75db6b7d79.tar.gz
SERVER-27938 Rename all OperationContext variables to opCtx
This commit is an automated rename of all whole word instances of txn, _txn, and txnPtr to opCtx, _opCtx, and opCtxPtr, respectively in all .cpp and .h files in src/mongo.
Diffstat (limited to 'src/mongo/db/s/config/configsvr_merge_chunk_command.cpp')
-rw-r--r--src/mongo/db/s/config/configsvr_merge_chunk_command.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mongo/db/s/config/configsvr_merge_chunk_command.cpp b/src/mongo/db/s/config/configsvr_merge_chunk_command.cpp
index 8988a5e4e4e..7d4dfc12b87 100644
--- a/src/mongo/db/s/config/configsvr_merge_chunk_command.cpp
+++ b/src/mongo/db/s/config/configsvr_merge_chunk_command.cpp
@@ -98,7 +98,7 @@ public:
return parseNsFullyQualified(dbname, cmdObj);
}
- bool run(OperationContext* txn,
+ bool run(OperationContext* opCtx,
const std::string& dbName,
BSONObj& cmdObj,
int options,
@@ -112,11 +112,11 @@ public:
auto parsedRequest = uassertStatusOK(MergeChunkRequest::parseFromConfigCommand(cmdObj));
Status mergeChunkResult =
- Grid::get(txn)->catalogManager()->commitChunkMerge(txn,
- parsedRequest.getNamespace(),
- parsedRequest.getEpoch(),
- parsedRequest.getChunkBoundaries(),
- parsedRequest.getShardName());
+ Grid::get(opCtx)->catalogManager()->commitChunkMerge(opCtx,
+ parsedRequest.getNamespace(),
+ parsedRequest.getEpoch(),
+ parsedRequest.getChunkBoundaries(),
+ parsedRequest.getShardName());
if (!mergeChunkResult.isOK()) {
return appendCommandStatus(result, mergeChunkResult);