diff options
| author | Huayu Ouyang <huayu.ouyang@mongodb.com> | 2021-05-11 15:01:20 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-05-11 15:36:57 +0000 |
| commit | 8951dcb47708e988e75565e4a8fa4bf8eb941d03 (patch) | |
| tree | 3b59cc2245eba083a6a73619c2e9d59f7855ed55 /src/mongo/db/s/add_shard_cmd.cpp | |
| parent | e3954abf64e035fbb3f8d221ae02f1b7015eeef4 (diff) | |
| download | mongo-8951dcb47708e988e75565e4a8fa4bf8eb941d03.tar.gz | |
Revert "SERVER-56241 Don't allow setting getLastErrorDefaults on startup/reconfig"
This reverts commit 942b6127cabbdfca9e76b8a8a1672d45a3474bf9.
Diffstat (limited to 'src/mongo/db/s/add_shard_cmd.cpp')
| -rw-r--r-- | src/mongo/db/s/add_shard_cmd.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
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 = |