summaryrefslogtreecommitdiff
path: root/src/mongo/db/s
diff options
context:
space:
mode:
authorJack Mulrow <jack.mulrow@mongodb.com>2018-05-10 14:07:28 -0400
committerJack Mulrow <jack.mulrow@mongodb.com>2018-05-10 15:02:23 -0400
commitb3bc4954c8f9044b92ccfbb4e872f87c69e39016 (patch)
tree20574bb11e8c8dd1c513c6ce44628a830ae5d70b /src/mongo/db/s
parent79e63d3d49169fbac6f02f66742bc26a9342ba2c (diff)
downloadmongo-b3bc4954c8f9044b92ccfbb4e872f87c69e39016.tar.gz
SERVER-32045 Set write concern on operation context before calling addShard in unittest
Diffstat (limited to 'src/mongo/db/s')
-rw-r--r--src/mongo/db/s/config/sharding_catalog_manager_add_shard_test.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mongo/db/s/config/sharding_catalog_manager_add_shard_test.cpp b/src/mongo/db/s/config/sharding_catalog_manager_add_shard_test.cpp
index 8b4793868c6..1ec6b87f2cc 100644
--- a/src/mongo/db/s/config/sharding_catalog_manager_add_shard_test.cpp
+++ b/src/mongo/db/s/config/sharding_catalog_manager_add_shard_test.cpp
@@ -387,6 +387,8 @@ TEST_F(AddShardTest, StandaloneBasicSuccess) {
DatabaseType discoveredDB1("TestDB1", ShardId("StandaloneShard"), false);
DatabaseType discoveredDB2("TestDB2", ShardId("StandaloneShard"), false);
+ operationContext()->setWriteConcern(ShardingCatalogClient::kMajorityWriteConcern);
+
auto future = launchAsync([this, expectedShardName] {
Client::initThreadIfNotAlready();
auto shardName =
@@ -418,7 +420,6 @@ TEST_F(AddShardTest, StandaloneBasicSuccess) {
expectShardIdentityUpsertReturnSuccess(shardTarget, expectedShardName);
// The shard receives the setFeatureCompatibilityVersion command.
- operationContext()->setWriteConcern(ShardingCatalogClient::kMajorityWriteConcern);
expectSetFeatureCompatibilityVersion(
shardTarget, BSON("ok" << 1), operationContext()->getWriteConcern().toBSON());