diff options
Diffstat (limited to 'src/mongo/db/s/config')
10 files changed, 55 insertions, 55 deletions
diff --git a/src/mongo/db/s/config/configsvr_add_shard_command.cpp b/src/mongo/db/s/config/configsvr_add_shard_command.cpp index 9f9b349b4df..5cfc614a816 100644 --- a/src/mongo/db/s/config/configsvr_add_shard_command.cpp +++ b/src/mongo/db/s/config/configsvr_add_shard_command.cpp @@ -86,7 +86,7 @@ public: return Status::OK(); } - bool run(OperationContext* txn, + bool run(OperationContext* opCtx, const std::string& unusedDbName, BSONObj& cmdObj, int options, @@ -105,7 +105,7 @@ public: } auto parsedRequest = std::move(swParsedRequest.getValue()); - auto replCoord = repl::ReplicationCoordinator::get(txn); + auto replCoord = repl::ReplicationCoordinator::get(opCtx); auto rsConfig = replCoord->getConfig(); auto validationStatus = parsedRequest.validate(rsConfig.isLocalHostAllowed()); @@ -119,8 +119,8 @@ public: parsedRequest.hasMaxSize() ? parsedRequest.getMaxSize() : kMaxSizeMBDefault); - StatusWith<string> addShardResult = Grid::get(txn)->catalogManager()->addShard( - txn, + StatusWith<string> addShardResult = Grid::get(opCtx)->catalogManager()->addShard( + opCtx, parsedRequest.hasName() ? &parsedRequest.getName() : nullptr, parsedRequest.getConnString(), parsedRequest.hasMaxSize() ? parsedRequest.getMaxSize() : kMaxSizeMBDefault); diff --git a/src/mongo/db/s/config/configsvr_add_shard_to_zone_command.cpp b/src/mongo/db/s/config/configsvr_add_shard_to_zone_command.cpp index 1b0a3db4148..236b2409af1 100644 --- a/src/mongo/db/s/config/configsvr_add_shard_to_zone_command.cpp +++ b/src/mongo/db/s/config/configsvr_add_shard_to_zone_command.cpp @@ -87,7 +87,7 @@ public: return Status::OK(); } - bool run(OperationContext* txn, + bool run(OperationContext* opCtx, const std::string& unusedDbName, BSONObj& cmdObj, int options, @@ -100,8 +100,8 @@ public: auto parsedRequest = uassertStatusOK(AddShardToZoneRequest::parseFromConfigCommand(cmdObj)); - uassertStatusOK(Grid::get(txn)->catalogManager()->addShardToZone( - txn, parsedRequest.getShardName(), parsedRequest.getZoneName())); + uassertStatusOK(Grid::get(opCtx)->catalogManager()->addShardToZone( + opCtx, parsedRequest.getShardName(), parsedRequest.getZoneName())); return true; } diff --git a/src/mongo/db/s/config/configsvr_commit_chunk_migration_command.cpp b/src/mongo/db/s/config/configsvr_commit_chunk_migration_command.cpp index 6e0f96328ee..5144be21703 100644 --- a/src/mongo/db/s/config/configsvr_commit_chunk_migration_command.cpp +++ b/src/mongo/db/s/config/configsvr_commit_chunk_migration_command.cpp @@ -117,7 +117,7 @@ public: return parseNsFullyQualified(dbname, cmdObj); } - bool run(OperationContext* txn, + bool run(OperationContext* opCtx, const std::string& dbName, BSONObj& cmdObj, int options, @@ -129,8 +129,8 @@ public: auto commitRequest = uassertStatusOK(CommitChunkMigrationRequest::createFromCommand(nss, cmdObj)); - StatusWith<BSONObj> response = Grid::get(txn)->catalogManager()->commitChunkMigration( - txn, + StatusWith<BSONObj> response = Grid::get(opCtx)->catalogManager()->commitChunkMigration( + opCtx, nss, commitRequest.getMigratedChunk(), commitRequest.getControlChunk(), diff --git a/src/mongo/db/s/config/configsvr_control_balancer_command.cpp b/src/mongo/db/s/config/configsvr_control_balancer_command.cpp index 88deff30a9e..f4905406f78 100644 --- a/src/mongo/db/s/config/configsvr_control_balancer_command.cpp +++ b/src/mongo/db/s/config/configsvr_control_balancer_command.cpp @@ -72,7 +72,7 @@ public: return Status::OK(); } - bool run(OperationContext* txn, + bool run(OperationContext* opCtx, const std::string& unusedDbName, BSONObj& cmdObj, int options, @@ -87,13 +87,13 @@ public: str::stream() << getName() << " can only be run on config servers", serverGlobalParams.clusterRole == ClusterRole::ConfigServer); - _run(txn, &result); + _run(opCtx, &result); return true; } private: - virtual void _run(OperationContext* txn, BSONObjBuilder* result) = 0; + virtual void _run(OperationContext* opCtx, BSONObjBuilder* result) = 0; }; class ConfigSvrBalancerStartCommand : public ConfigSvrBalancerControlCommand { @@ -101,9 +101,9 @@ public: ConfigSvrBalancerStartCommand() : ConfigSvrBalancerControlCommand("_configsvrBalancerStart") {} private: - void _run(OperationContext* txn, BSONObjBuilder* result) override { - uassertStatusOK(Grid::get(txn)->getBalancerConfiguration()->setBalancerMode( - txn, BalancerSettingsType::kFull)); + void _run(OperationContext* opCtx, BSONObjBuilder* result) override { + uassertStatusOK(Grid::get(opCtx)->getBalancerConfiguration()->setBalancerMode( + opCtx, BalancerSettingsType::kFull)); } }; @@ -112,10 +112,10 @@ public: ConfigSvrBalancerStopCommand() : ConfigSvrBalancerControlCommand("_configsvrBalancerStop") {} private: - void _run(OperationContext* txn, BSONObjBuilder* result) override { - uassertStatusOK(Grid::get(txn)->getBalancerConfiguration()->setBalancerMode( - txn, BalancerSettingsType::kOff)); - Balancer::get(txn)->joinCurrentRound(txn); + void _run(OperationContext* opCtx, BSONObjBuilder* result) override { + uassertStatusOK(Grid::get(opCtx)->getBalancerConfiguration()->setBalancerMode( + opCtx, BalancerSettingsType::kOff)); + Balancer::get(opCtx)->joinCurrentRound(opCtx); } }; @@ -125,8 +125,8 @@ public: : ConfigSvrBalancerControlCommand("_configsvrBalancerStatus") {} private: - void _run(OperationContext* txn, BSONObjBuilder* result) override { - Balancer::get(txn)->report(txn, result); + void _run(OperationContext* opCtx, BSONObjBuilder* result) override { + Balancer::get(opCtx)->report(opCtx, result); } }; 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); diff --git a/src/mongo/db/s/config/configsvr_move_chunk_command.cpp b/src/mongo/db/s/config/configsvr_move_chunk_command.cpp index 0e64207a217..8b4fe32025e 100644 --- a/src/mongo/db/s/config/configsvr_move_chunk_command.cpp +++ b/src/mongo/db/s/config/configsvr_move_chunk_command.cpp @@ -78,7 +78,7 @@ public: return Status::OK(); } - bool run(OperationContext* txn, + bool run(OperationContext* opCtx, const std::string& unusedDbName, BSONObj& cmdObj, int options, @@ -87,14 +87,14 @@ public: auto request = uassertStatusOK(BalanceChunkRequest::parseFromConfigCommand(cmdObj)); if (request.hasToShardId()) { - uassertStatusOK(Balancer::get(txn)->moveSingleChunk(txn, - request.getChunk(), - request.getToShardId(), - request.getMaxChunkSizeBytes(), - request.getSecondaryThrottle(), - request.getWaitForDelete())); + uassertStatusOK(Balancer::get(opCtx)->moveSingleChunk(opCtx, + request.getChunk(), + request.getToShardId(), + request.getMaxChunkSizeBytes(), + request.getSecondaryThrottle(), + request.getWaitForDelete())); } else { - uassertStatusOK(Balancer::get(txn)->rebalanceSingleChunk(txn, request.getChunk())); + uassertStatusOK(Balancer::get(opCtx)->rebalanceSingleChunk(opCtx, request.getChunk())); } return true; diff --git a/src/mongo/db/s/config/configsvr_remove_shard_from_zone_command.cpp b/src/mongo/db/s/config/configsvr_remove_shard_from_zone_command.cpp index 376bf5cfd5f..ae83006e471 100644 --- a/src/mongo/db/s/config/configsvr_remove_shard_from_zone_command.cpp +++ b/src/mongo/db/s/config/configsvr_remove_shard_from_zone_command.cpp @@ -87,7 +87,7 @@ public: return Status::OK(); } - bool run(OperationContext* txn, + bool run(OperationContext* opCtx, const std::string& unusedDbName, BSONObj& cmdObj, int options, @@ -101,8 +101,8 @@ public: auto parsedRequest = uassertStatusOK(RemoveShardFromZoneRequest::parseFromConfigCommand(cmdObj)); - uassertStatusOK(Grid::get(txn)->catalogManager()->removeShardFromZone( - txn, parsedRequest.getShardName(), parsedRequest.getZoneName())); + uassertStatusOK(Grid::get(opCtx)->catalogManager()->removeShardFromZone( + opCtx, parsedRequest.getShardName(), parsedRequest.getZoneName())); return true; } diff --git a/src/mongo/db/s/config/configsvr_set_feature_compatibility_version_command.cpp b/src/mongo/db/s/config/configsvr_set_feature_compatibility_version_command.cpp index 694cec5f96c..8e1fa7825e8 100644 --- a/src/mongo/db/s/config/configsvr_set_feature_compatibility_version_command.cpp +++ b/src/mongo/db/s/config/configsvr_set_feature_compatibility_version_command.cpp @@ -81,7 +81,7 @@ public: return Status::OK(); } - bool run(OperationContext* txn, + bool run(OperationContext* opCtx, const std::string& unusedDbName, BSONObj& cmdObj, int options, @@ -97,11 +97,11 @@ public: serverGlobalParams.clusterRole == ClusterRole::ConfigServer); // Forward to all shards. - uassertStatusOK( - Grid::get(txn)->catalogManager()->setFeatureCompatibilityVersionOnShards(txn, version)); + uassertStatusOK(Grid::get(opCtx)->catalogManager()->setFeatureCompatibilityVersionOnShards( + opCtx, version)); // On success, set featureCompatibilityVersion on self. - FeatureCompatibilityVersion::set(txn, version); + FeatureCompatibilityVersion::set(opCtx, version); return true; } diff --git a/src/mongo/db/s/config/configsvr_split_chunk_command.cpp b/src/mongo/db/s/config/configsvr_split_chunk_command.cpp index a8744987929..0b3cfe6f40d 100644 --- a/src/mongo/db/s/config/configsvr_split_chunk_command.cpp +++ b/src/mongo/db/s/config/configsvr_split_chunk_command.cpp @@ -96,7 +96,7 @@ public: return parseNsFullyQualified(dbname, cmdObj); } - bool run(OperationContext* txn, + bool run(OperationContext* opCtx, const std::string& dbName, BSONObj& cmdObj, int options, @@ -110,12 +110,12 @@ public: auto parsedRequest = uassertStatusOK(SplitChunkRequest::parseFromConfigCommand(cmdObj)); Status splitChunkResult = - Grid::get(txn)->catalogManager()->commitChunkSplit(txn, - parsedRequest.getNamespace(), - parsedRequest.getEpoch(), - parsedRequest.getChunkRange(), - parsedRequest.getSplitPoints(), - parsedRequest.getShardName()); + Grid::get(opCtx)->catalogManager()->commitChunkSplit(opCtx, + parsedRequest.getNamespace(), + parsedRequest.getEpoch(), + parsedRequest.getChunkRange(), + parsedRequest.getSplitPoints(), + parsedRequest.getShardName()); if (!splitChunkResult.isOK()) { return appendCommandStatus(result, splitChunkResult); } diff --git a/src/mongo/db/s/config/configsvr_update_zone_key_range_command.cpp b/src/mongo/db/s/config/configsvr_update_zone_key_range_command.cpp index 09ff5f8bf74..36d68576568 100644 --- a/src/mongo/db/s/config/configsvr_update_zone_key_range_command.cpp +++ b/src/mongo/db/s/config/configsvr_update_zone_key_range_command.cpp @@ -89,7 +89,7 @@ public: return Status::OK(); } - bool run(OperationContext* txn, + bool run(OperationContext* opCtx, const std::string& unusedDbName, BSONObj& cmdObj, int options, @@ -109,11 +109,11 @@ public: } if (parsedRequest.isRemove()) { - uassertStatusOK(Grid::get(txn)->catalogManager()->removeKeyRangeFromZone( - txn, parsedRequest.getNS(), parsedRequest.getRange())); + uassertStatusOK(Grid::get(opCtx)->catalogManager()->removeKeyRangeFromZone( + opCtx, parsedRequest.getNS(), parsedRequest.getRange())); } else { - uassertStatusOK(Grid::get(txn)->catalogManager()->assignKeyRangeToZone( - txn, parsedRequest.getNS(), parsedRequest.getRange(), zoneName)); + uassertStatusOK(Grid::get(opCtx)->catalogManager()->assignKeyRangeToZone( + opCtx, parsedRequest.getNS(), parsedRequest.getRange(), zoneName)); } return true; |