diff options
Diffstat (limited to 'src/mongo/db/s')
20 files changed, 41 insertions, 39 deletions
diff --git a/src/mongo/db/s/balancer/migration_manager_test.cpp b/src/mongo/db/s/balancer/migration_manager_test.cpp index fb4ed4905ea..82be67e10a4 100644 --- a/src/mongo/db/s/balancer/migration_manager_test.cpp +++ b/src/mongo/db/s/balancer/migration_manager_test.cpp @@ -283,7 +283,7 @@ void MigrationManagerTest::expectMoveChunkCommand(const ChunkType& chunk, const ShardId& toShardId, const Status& returnStatus) { BSONObjBuilder resultBuilder; - Command::appendCommandStatus(resultBuilder, returnStatus); + CommandHelpers::appendCommandStatus(resultBuilder, returnStatus); expectMoveChunkCommand(chunk, toShardId, resultBuilder.obj()); } diff --git a/src/mongo/db/s/check_sharding_index_command.cpp b/src/mongo/db/s/check_sharding_index_command.cpp index 6955d93db83..2d1e0e674da 100644 --- a/src/mongo/db/s/check_sharding_index_command.cpp +++ b/src/mongo/db/s/check_sharding_index_command.cpp @@ -80,7 +80,7 @@ public: } virtual std::string parseNs(const std::string& dbname, const BSONObj& cmdObj) const { - return parseNsFullyQualified(dbname, cmdObj); + return CommandHelpers::parseNsFullyQualified(dbname, cmdObj); } bool errmsgRun(OperationContext* opCtx, @@ -200,7 +200,7 @@ public: } if (PlanExecutor::DEAD == state || PlanExecutor::FAILURE == state) { - return appendCommandStatus( + return CommandHelpers::appendCommandStatus( result, Status(ErrorCodes::OperationFailed, str::stream() << "Executor error while checking sharding index: " 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 214e109ebb3..329c24127ce 100644 --- a/src/mongo/db/s/config/configsvr_add_shard_command.cpp +++ b/src/mongo/db/s/config/configsvr_add_shard_command.cpp @@ -92,7 +92,7 @@ public: const BSONObj& cmdObj, BSONObjBuilder& result) override { if (serverGlobalParams.clusterRole != ClusterRole::ConfigServer) { - return appendCommandStatus( + return CommandHelpers::appendCommandStatus( result, Status(ErrorCodes::IllegalOperation, "_configsvrAddShard can only be run on config servers")); @@ -104,7 +104,7 @@ public: auto swParsedRequest = AddShardRequest::parseFromConfigCommand(cmdObj); if (!swParsedRequest.isOK()) { - return appendCommandStatus(result, swParsedRequest.getStatus()); + return CommandHelpers::appendCommandStatus(result, swParsedRequest.getStatus()); } auto parsedRequest = std::move(swParsedRequest.getValue()); @@ -113,7 +113,7 @@ public: auto validationStatus = parsedRequest.validate(rsConfig.isLocalHostAllowed()); if (!validationStatus.isOK()) { - return appendCommandStatus(result, validationStatus); + return CommandHelpers::appendCommandStatus(result, validationStatus); } uassert(ErrorCodes::InvalidOptions, @@ -136,7 +136,7 @@ public: if (!addShardResult.isOK()) { log() << "addShard request '" << parsedRequest << "'" << "failed" << causedBy(addShardResult.getStatus()); - return appendCommandStatus(result, addShardResult.getStatus()); + return CommandHelpers::appendCommandStatus(result, addShardResult.getStatus()); } result << "shardAdded" << addShardResult.getValue(); 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 7be915ca4f4..49b01f5454f 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 @@ -114,7 +114,7 @@ public: } std::string parseNs(const std::string& dbname, const BSONObj& cmdObj) const override { - return parseNsFullyQualified(dbname, cmdObj); + return CommandHelpers::parseNsFullyQualified(dbname, cmdObj); } bool run(OperationContext* opCtx, @@ -136,7 +136,7 @@ public: commitRequest.getFromShard(), commitRequest.getToShard()); if (!response.isOK()) { - return appendCommandStatus(result, response.getStatus()); + return CommandHelpers::appendCommandStatus(result, response.getStatus()); } result.appendElements(response.getValue()); return true; diff --git a/src/mongo/db/s/config/configsvr_create_database_command.cpp b/src/mongo/db/s/config/configsvr_create_database_command.cpp index 86690de4e2e..a95c6748860 100644 --- a/src/mongo/db/s/config/configsvr_create_database_command.cpp +++ b/src/mongo/db/s/config/configsvr_create_database_command.cpp @@ -97,7 +97,7 @@ public: BSONObjBuilder& result) { if (serverGlobalParams.clusterRole != ClusterRole::ConfigServer) { - return appendCommandStatus( + return CommandHelpers::appendCommandStatus( result, Status(ErrorCodes::IllegalOperation, "_configsvrCreateDatabase can only be run on config servers")); diff --git a/src/mongo/db/s/config/configsvr_drop_collection_command.cpp b/src/mongo/db/s/config/configsvr_drop_collection_command.cpp index e186584a120..2b3987585bc 100644 --- a/src/mongo/db/s/config/configsvr_drop_collection_command.cpp +++ b/src/mongo/db/s/config/configsvr_drop_collection_command.cpp @@ -87,7 +87,7 @@ public: } std::string parseNs(const std::string& dbname, const BSONObj& cmdObj) const override { - return parseNsFullyQualified(dbname, cmdObj); + return CommandHelpers::parseNsFullyQualified(dbname, cmdObj); } bool run(OperationContext* opCtx, @@ -96,7 +96,7 @@ public: BSONObjBuilder& result) override { if (serverGlobalParams.clusterRole != ClusterRole::ConfigServer) { - return appendCommandStatus( + return CommandHelpers::appendCommandStatus( result, Status(ErrorCodes::IllegalOperation, "_configsvrDropCollection can only be run on config servers")); diff --git a/src/mongo/db/s/config/configsvr_drop_database_command.cpp b/src/mongo/db/s/config/configsvr_drop_database_command.cpp index 0439cf35cf2..c772c34cf97 100644 --- a/src/mongo/db/s/config/configsvr_drop_database_command.cpp +++ b/src/mongo/db/s/config/configsvr_drop_database_command.cpp @@ -91,7 +91,7 @@ public: const BSONObj& cmdObj, BSONObjBuilder& result) { if (serverGlobalParams.clusterRole != ClusterRole::ConfigServer) { - return appendCommandStatus( + return CommandHelpers::appendCommandStatus( result, Status(ErrorCodes::IllegalOperation, "_configsvrDropDatabase can only be run on config servers")); diff --git a/src/mongo/db/s/config/configsvr_enable_sharding_command.cpp b/src/mongo/db/s/config/configsvr_enable_sharding_command.cpp index 62b1ff60606..cc60ec19b77 100644 --- a/src/mongo/db/s/config/configsvr_enable_sharding_command.cpp +++ b/src/mongo/db/s/config/configsvr_enable_sharding_command.cpp @@ -99,7 +99,7 @@ public: BSONObjBuilder& result) { if (serverGlobalParams.clusterRole != ClusterRole::ConfigServer) { - return appendCommandStatus( + return CommandHelpers::appendCommandStatus( result, Status(ErrorCodes::IllegalOperation, "_configsvrEnableSharding can only be run on config servers")); @@ -113,9 +113,10 @@ public: NamespaceString::validDBName(dbname, NamespaceString::DollarInDbNameBehavior::Allow)); if (dbname == NamespaceString::kAdminDb || dbname == NamespaceString::kLocalDb) { - return appendCommandStatus(result, - {ErrorCodes::InvalidOptions, - str::stream() << "can't shard " + dbname + " database"}); + return CommandHelpers::appendCommandStatus( + result, + {ErrorCodes::InvalidOptions, + str::stream() << "can't shard " + dbname + " database"}); } uassert(ErrorCodes::InvalidOptions, 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 07d4af626f3..4f7f06c5176 100644 --- a/src/mongo/db/s/config/configsvr_merge_chunk_command.cpp +++ b/src/mongo/db/s/config/configsvr_merge_chunk_command.cpp @@ -95,7 +95,7 @@ public: } std::string parseNs(const std::string& dbname, const BSONObj& cmdObj) const override { - return parseNsFullyQualified(dbname, cmdObj); + return CommandHelpers::parseNsFullyQualified(dbname, cmdObj); } bool run(OperationContext* opCtx, @@ -117,7 +117,7 @@ public: parsedRequest.getShardName()); if (!mergeChunkResult.isOK()) { - return appendCommandStatus(result, mergeChunkResult); + return CommandHelpers::appendCommandStatus(result, mergeChunkResult); } return true; diff --git a/src/mongo/db/s/config/configsvr_move_primary_command.cpp b/src/mongo/db/s/config/configsvr_move_primary_command.cpp index 3d1c85fa85f..3ccde97a393 100644 --- a/src/mongo/db/s/config/configsvr_move_primary_command.cpp +++ b/src/mongo/db/s/config/configsvr_move_primary_command.cpp @@ -110,7 +110,7 @@ public: BSONObjBuilder& result) override { if (serverGlobalParams.clusterRole != ClusterRole::ConfigServer) { - return appendCommandStatus( + return CommandHelpers::appendCommandStatus( result, Status(ErrorCodes::IllegalOperation, "_configsvrMovePrimary can only be run on config servers")); @@ -127,7 +127,7 @@ public: if (dbname == NamespaceString::kAdminDb || dbname == NamespaceString::kConfigDb || dbname == NamespaceString::kLocalDb) { - return appendCommandStatus( + return CommandHelpers::appendCommandStatus( result, {ErrorCodes::InvalidOptions, str::stream() << "Can't move primary for " << dbname << " database"}); @@ -159,7 +159,7 @@ public: const std::string to = movePrimaryRequest.getTo().toString(); if (to.empty()) { - return appendCommandStatus( + return CommandHelpers::appendCommandStatus( result, {ErrorCodes::InvalidOptions, str::stream() << "you have to specify where you want to move it"}); @@ -231,7 +231,7 @@ public: if (!worked) { log() << "clone failed" << redact(cloneRes); - return appendCommandStatus( + return CommandHelpers::appendCommandStatus( result, {ErrorCodes::OperationFailed, str::stream() << "clone failed"}); } diff --git a/src/mongo/db/s/config/configsvr_remove_shard_command.cpp b/src/mongo/db/s/config/configsvr_remove_shard_command.cpp index d16fa7950c0..ae0b3e070aa 100644 --- a/src/mongo/db/s/config/configsvr_remove_shard_command.cpp +++ b/src/mongo/db/s/config/configsvr_remove_shard_command.cpp @@ -109,7 +109,8 @@ public: std::string msg(str::stream() << "Could not drop shard '" << target << "' because it does not exist"); log() << msg; - return appendCommandStatus(result, Status(ErrorCodes::ShardNotFound, msg)); + return CommandHelpers::appendCommandStatus(result, + Status(ErrorCodes::ShardNotFound, msg)); } const auto& shard = shardStatus.getValue(); @@ -156,7 +157,7 @@ public: nullptr, repl::ReadConcernLevel::kMajorityReadConcern); if (!swChunks.isOK()) { - return appendCommandStatus(result, swChunks.getStatus()); + return CommandHelpers::appendCommandStatus(result, swChunks.getStatus()); } const auto& chunks = swChunks.getValue(); diff --git a/src/mongo/db/s/config/configsvr_shard_collection_command.cpp b/src/mongo/db/s/config/configsvr_shard_collection_command.cpp index 49d09e326e5..64cc9986f58 100644 --- a/src/mongo/db/s/config/configsvr_shard_collection_command.cpp +++ b/src/mongo/db/s/config/configsvr_shard_collection_command.cpp @@ -725,7 +725,7 @@ public: } std::string parseNs(const std::string& dbname, const BSONObj& cmdObj) const override { - return parseNsFullyQualified(dbname, cmdObj); + return CommandHelpers::parseNsFullyQualified(dbname, cmdObj); } bool run(OperationContext* opCtx, 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 23e243384dd..4740525ee23 100644 --- a/src/mongo/db/s/config/configsvr_split_chunk_command.cpp +++ b/src/mongo/db/s/config/configsvr_split_chunk_command.cpp @@ -93,7 +93,7 @@ public: } std::string parseNs(const std::string& dbname, const BSONObj& cmdObj) const override { - return parseNsFullyQualified(dbname, cmdObj); + return CommandHelpers::parseNsFullyQualified(dbname, cmdObj); } bool run(OperationContext* opCtx, diff --git a/src/mongo/db/s/flush_routing_table_cache_updates_command.cpp b/src/mongo/db/s/flush_routing_table_cache_updates_command.cpp index 3bdf4d5556f..e24808b412c 100644 --- a/src/mongo/db/s/flush_routing_table_cache_updates_command.cpp +++ b/src/mongo/db/s/flush_routing_table_cache_updates_command.cpp @@ -79,7 +79,7 @@ public: } std::string parseNs(const std::string& dbname, const BSONObj& cmdObj) const override { - return parseNsFullyQualified(dbname, cmdObj); + return CommandHelpers::parseNsFullyQualified(dbname, cmdObj); } Status checkAuthForCommand(Client* client, diff --git a/src/mongo/db/s/get_shard_version_command.cpp b/src/mongo/db/s/get_shard_version_command.cpp index 7cdfa33f98c..65ab0f0b652 100644 --- a/src/mongo/db/s/get_shard_version_command.cpp +++ b/src/mongo/db/s/get_shard_version_command.cpp @@ -78,7 +78,7 @@ public: } std::string parseNs(const std::string& dbname, const BSONObj& cmdObj) const override { - return parseNsFullyQualified(dbname, cmdObj); + return CommandHelpers::parseNsFullyQualified(dbname, cmdObj); } bool run(OperationContext* opCtx, diff --git a/src/mongo/db/s/merge_chunks_command.cpp b/src/mongo/db/s/merge_chunks_command.cpp index aba860514cb..aa36b6dfdf9 100644 --- a/src/mongo/db/s/merge_chunks_command.cpp +++ b/src/mongo/db/s/merge_chunks_command.cpp @@ -333,7 +333,7 @@ public: } std::string parseNs(const std::string& dbname, const BSONObj& cmdObj) const override { - return parseNsFullyQualified(dbname, cmdObj); + return CommandHelpers::parseNsFullyQualified(dbname, cmdObj); } bool adminOnly() const override { @@ -404,7 +404,7 @@ public: } auto mergeStatus = mergeChunks(opCtx, NamespaceString(ns), minKey, maxKey, epoch); - return appendCommandStatus(result, mergeStatus); + return CommandHelpers::appendCommandStatus(result, mergeStatus); } } mergeChunksCmd; diff --git a/src/mongo/db/s/migration_destination_manager_legacy_commands.cpp b/src/mongo/db/s/migration_destination_manager_legacy_commands.cpp index 1024433b5d6..007288ff96d 100644 --- a/src/mongo/db/s/migration_destination_manager_legacy_commands.cpp +++ b/src/mongo/db/s/migration_destination_manager_legacy_commands.cpp @@ -232,7 +232,7 @@ public: mdm->report(result); if (!status.isOK()) { log() << status.reason(); - return appendCommandStatus(result, status); + return CommandHelpers::appendCommandStatus(result, status); } return true; } @@ -281,7 +281,7 @@ public: mdm->report(result); if (!status.isOK()) { log() << status.reason(); - return appendCommandStatus(result, status); + return CommandHelpers::appendCommandStatus(result, status); } } else if (migrationSessionIdStatus == ErrorCodes::NoSuchKey) { mdm->abortWithoutSessionIdCheck(); diff --git a/src/mongo/db/s/move_chunk_command.cpp b/src/mongo/db/s/move_chunk_command.cpp index 235e053a3f8..f736f1b8d2e 100644 --- a/src/mongo/db/s/move_chunk_command.cpp +++ b/src/mongo/db/s/move_chunk_command.cpp @@ -103,7 +103,7 @@ public: } std::string parseNs(const std::string& dbname, const BSONObj& cmdObj) const override { - return parseNsFullyQualified(dbname, cmdObj); + return CommandHelpers::parseNsFullyQualified(dbname, cmdObj); } bool run(OperationContext* opCtx, @@ -151,7 +151,7 @@ public: // and the 3.4 shard, which failed to set the ChunkTooBig status code. // TODO: Remove after 3.6 is released. result.appendBool("chunkTooBig", true); - return appendCommandStatus(result, status); + return CommandHelpers::appendCommandStatus(result, status); } uassertStatusOK(status); diff --git a/src/mongo/db/s/split_chunk_command.cpp b/src/mongo/db/s/split_chunk_command.cpp index bd783fd6b84..4d0060cb941 100644 --- a/src/mongo/db/s/split_chunk_command.cpp +++ b/src/mongo/db/s/split_chunk_command.cpp @@ -87,7 +87,7 @@ public: } std::string parseNs(const std::string& dbname, const BSONObj& cmdObj) const override { - return parseNsFullyQualified(dbname, cmdObj); + return CommandHelpers::parseNsFullyQualified(dbname, cmdObj); } bool errmsgRun(OperationContext* opCtx, @@ -126,7 +126,7 @@ public: string shardName; auto parseShardNameStatus = bsonExtractStringField(cmdObj, "from", &shardName); if (!parseShardNameStatus.isOK()) - return appendCommandStatus(result, parseShardNameStatus); + return CommandHelpers::appendCommandStatus(result, parseShardNameStatus); log() << "received splitChunk request: " << redact(cmdObj); diff --git a/src/mongo/db/s/split_vector_command.cpp b/src/mongo/db/s/split_vector_command.cpp index 5f2ec7da886..3a6fed519ec 100644 --- a/src/mongo/db/s/split_vector_command.cpp +++ b/src/mongo/db/s/split_vector_command.cpp @@ -80,7 +80,7 @@ public: } std::string parseNs(const string& dbname, const BSONObj& cmdObj) const override { - return parseNsFullyQualified(dbname, cmdObj); + return CommandHelpers::CommandHelpers::parseNsFullyQualified(dbname, cmdObj); } bool errmsgRun(OperationContext* opCtx, @@ -145,7 +145,7 @@ public: maxChunkSize, maxChunkSizeBytes); if (!statusWithSplitKeys.isOK()) { - return appendCommandStatus(result, statusWithSplitKeys.getStatus()); + return CommandHelpers::appendCommandStatus(result, statusWithSplitKeys.getStatus()); } result.append("splitKeys", statusWithSplitKeys.getValue()); |