From 8951dcb47708e988e75565e4a8fa4bf8eb941d03 Mon Sep 17 00:00:00 2001 From: Huayu Ouyang Date: Tue, 11 May 2021 15:01:20 +0000 Subject: Revert "SERVER-56241 Don't allow setting getLastErrorDefaults on startup/reconfig" This reverts commit 942b6127cabbdfca9e76b8a8a1672d45a3474bf9. --- src/mongo/db/s/add_shard_cmd.cpp | 9 --------- 1 file changed, 9 deletions(-) (limited to 'src/mongo/db/s/add_shard_cmd.cpp') diff --git a/src/mongo/db/s/add_shard_cmd.cpp b/src/mongo/db/s/add_shard_cmd.cpp index a66a43b8d6b..38b39b7bd47 100644 --- a/src/mongo/db/s/add_shard_cmd.cpp +++ b/src/mongo/db/s/add_shard_cmd.cpp @@ -37,10 +37,8 @@ #include "mongo/db/auth/privilege.h" #include "mongo/db/commands.h" #include "mongo/db/dbdirectclient.h" -#include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/s/add_shard_cmd_gen.h" #include "mongo/db/s/add_shard_util.h" -#include "mongo/db/server_options.h" #include "mongo/rpc/get_status_from_command_result.h" #include "mongo/s/balancer_configuration.h" #include "mongo/s/grid.h" @@ -62,13 +60,6 @@ public: uassert(50876, "Cannot run addShard on a node started without --shardsvr", serverGlobalParams.clusterRole == ClusterRole::ShardServer); - tassert(5624104, - "Cannot run addShard on a node that contains customized getLastErrorDefaults, " - "which has been deprecated and is now ignored. Use setDefaultRWConcern instead " - "to set a cluster-wide default writeConcern.", - !repl::ReplicationCoordinator::get(opCtx) - ->getConfig() - .containsCustomizedGetLastErrorDefaults()); auto addShardCmd = request(); auto shardIdUpsertCmd = -- cgit v1.2.1