diff options
author | Maria van Keulen <maria@mongodb.com> | 2017-03-07 12:00:08 -0500 |
---|---|---|
committer | Maria van Keulen <maria@mongodb.com> | 2017-03-07 12:00:08 -0500 |
commit | 589a5c169ced8f6e9ddcd3d182ae1b75db6b7d79 (patch) | |
tree | c7a090ffdd56a91ae677e2492c61b820af44f964 /src/mongo/db/write_concern.cpp | |
parent | 3cba97198638df3750e3b455e2ad57af7ee536ae (diff) | |
download | mongo-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/write_concern.cpp')
-rw-r--r-- | src/mongo/db/write_concern.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/mongo/db/write_concern.cpp b/src/mongo/db/write_concern.cpp index 77a90f0e396..314ef6c05b6 100644 --- a/src/mongo/db/write_concern.cpp +++ b/src/mongo/db/write_concern.cpp @@ -66,13 +66,13 @@ bool commandSpecifiesWriteConcern(const BSONObj& cmdObj) { return cmdObj.hasField(WriteConcernOptions::kWriteConcernField); } -StatusWith<WriteConcernOptions> extractWriteConcern(OperationContext* txn, +StatusWith<WriteConcernOptions> extractWriteConcern(OperationContext* opCtx, const BSONObj& cmdObj, const std::string& dbName) { // The default write concern if empty is {w:1}. Specifying {w:0} is/was allowed, but is // interpreted identically to {w:1}. auto wcResult = WriteConcernOptions::extractWCFromCommand( - cmdObj, dbName, repl::ReplicationCoordinator::get(txn)->getGetLastErrorDefault()); + cmdObj, dbName, repl::ReplicationCoordinator::get(opCtx)->getGetLastErrorDefault()); if (!wcResult.isOK()) { return wcResult.getStatus(); } @@ -81,14 +81,14 @@ StatusWith<WriteConcernOptions> extractWriteConcern(OperationContext* txn, if (writeConcern.usedDefault) { if (serverGlobalParams.clusterRole == ClusterRole::ConfigServer && - !txn->getClient()->isInDirectClient()) { + !opCtx->getClient()->isInDirectClient()) { // This is here only for backwards compatibility with 3.2 clusters which have commands // that do not specify write concern when writing to the config server. writeConcern = { WriteConcernOptions::kMajority, WriteConcernOptions::SyncMode::UNSET, Seconds(30)}; } } else { - Status wcStatus = validateWriteConcern(txn, writeConcern, dbName); + Status wcStatus = validateWriteConcern(opCtx, writeConcern, dbName); if (!wcStatus.isOK()) { return wcStatus; } @@ -97,11 +97,11 @@ StatusWith<WriteConcernOptions> extractWriteConcern(OperationContext* txn, return writeConcern; } -Status validateWriteConcern(OperationContext* txn, +Status validateWriteConcern(OperationContext* opCtx, const WriteConcernOptions& writeConcern, StringData dbName) { if (writeConcern.syncMode == WriteConcernOptions::SyncMode::JOURNAL && - !txn->getServiceContext()->getGlobalStorageEngine()->isDurable()) { + !opCtx->getServiceContext()->getGlobalStorageEngine()->isDurable()) { return Status(ErrorCodes::BadValue, "cannot use 'j' option when a host does not have journaling enabled"); } @@ -113,7 +113,7 @@ Status validateWriteConcern(OperationContext* txn, dbName != NamespaceString::kLocalDb && !writeConcern.validForConfigServers()) { // The only cases where we allow non-majority writes are from within the config servers // themselves, because these wait for write concern explicitly. - if (!txn->getClient()->isInDirectClient()) { + if (!opCtx->getClient()->isInDirectClient()) { return {ErrorCodes::BadValue, str::stream() << "w:'majority' is the only valid write concern when writing " "to config servers, got: " @@ -121,7 +121,7 @@ Status validateWriteConcern(OperationContext* txn, } } - const auto replMode = repl::ReplicationCoordinator::get(txn)->getReplicationMode(); + const auto replMode = repl::ReplicationCoordinator::get(opCtx)->getReplicationMode(); if (replMode == repl::ReplicationCoordinator::modeNone && writeConcern.wNumNodes > 1) { return Status(ErrorCodes::BadValue, "cannot use 'w' > 1 when a host is not replicated"); @@ -175,13 +175,13 @@ void WriteConcernResult::appendTo(const WriteConcernOptions& writeConcern, !result->asTempObj()["waited"].eoo())); } -Status waitForWriteConcern(OperationContext* txn, +Status waitForWriteConcern(OperationContext* opCtx, const OpTime& replOpTime, const WriteConcernOptions& writeConcern, WriteConcernResult* result) { LOG(2) << "Waiting for write concern. OpTime: " << replOpTime << ", write concern: " << writeConcern.toBSON(); - auto replCoord = repl::ReplicationCoordinator::get(txn); + auto replCoord = repl::ReplicationCoordinator::get(opCtx); MONGO_FAIL_POINT_PAUSE_WHILE_SET(hangBeforeWaitingForWriteConcern); @@ -199,10 +199,10 @@ Status waitForWriteConcern(OperationContext* txn, case WriteConcernOptions::SyncMode::FSYNC: { StorageEngine* storageEngine = getGlobalServiceContext()->getGlobalStorageEngine(); if (!storageEngine->isDurable()) { - result->fsyncFiles = storageEngine->flushAllFiles(txn, true); + result->fsyncFiles = storageEngine->flushAllFiles(opCtx, true); } else { // We only need to commit the journal if we're durable - txn->recoveryUnit()->waitUntilDurable(); + opCtx->recoveryUnit()->waitUntilDurable(); } break; } @@ -211,10 +211,10 @@ Status waitForWriteConcern(OperationContext* txn, // Wait for ops to become durable then update replication system's // knowledge of this. OpTime appliedOpTime = replCoord->getMyLastAppliedOpTime(); - txn->recoveryUnit()->waitUntilDurable(); + opCtx->recoveryUnit()->waitUntilDurable(); replCoord->setMyLastDurableOpTimeForward(appliedOpTime); } else { - txn->recoveryUnit()->waitUntilDurable(); + opCtx->recoveryUnit()->waitUntilDurable(); } break; } @@ -237,7 +237,7 @@ Status waitForWriteConcern(OperationContext* txn, // Replica set stepdowns and gle mode changes are thrown as errors repl::ReplicationCoordinator::StatusAndDuration replStatus = - replCoord->awaitReplication(txn, replOpTime, writeConcernWithPopulatedSyncMode); + replCoord->awaitReplication(opCtx, replOpTime, writeConcernWithPopulatedSyncMode); if (replStatus.status == ErrorCodes::WriteConcernFailed) { gleWtimeouts.increment(); result->err = "timeout"; |