diff options
| author | Luis Osta <luis.osta@mongodb.com> | 2021-10-29 14:07:16 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-10-29 19:25:21 +0000 |
| commit | 1623ffcd7b9465796b0d03ce8ec5647975e3273e (patch) | |
| tree | 7c3e525e53d9cd4d9580f72d8e90acb88066b7b3 | |
| parent | 73b81b958fc245dcd72b55830868c63f07993b73 (diff) | |
| download | mongo-1623ffcd7b9465796b0d03ce8ec5647975e3273e.tar.gz | |
SERVER-61052 Remove wtimeout from resharding write concern
| -rw-r--r-- | src/mongo/db/s/resharding/resharding_donor_service.cpp | 5 | ||||
| -rw-r--r-- | src/mongo/db/s/resharding/resharding_recipient_service_external_state.cpp | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/mongo/db/s/resharding/resharding_donor_service.cpp b/src/mongo/db/s/resharding/resharding_donor_service.cpp index 47531049526..40480daa8c9 100644 --- a/src/mongo/db/s/resharding/resharding_donor_service.cpp +++ b/src/mongo/db/s/resharding/resharding_donor_service.cpp @@ -56,6 +56,7 @@ #include "mongo/db/s/resharding/resharding_server_parameters_gen.h" #include "mongo/db/s/resharding_util.h" #include "mongo/db/s/sharding_state.h" +#include "mongo/db/write_concern_options.h" #include "mongo/logv2/log.h" #include "mongo/s/catalog/sharding_catalog_client.h" #include "mongo/s/grid.h" @@ -71,6 +72,8 @@ using namespace fmt::literals; namespace { const WriteConcernOptions kNoWaitWriteConcern{1, WriteConcernOptions::SyncMode::UNSET, Seconds(0)}; +const WriteConcernOptions kMajorityWriteConcern{ + WriteConcernOptions::kMajority, WriteConcernOptions::SyncMode::UNSET, Seconds(0)}; Date_t getCurrentTime() { const auto svcCtx = cc().getServiceContext(); @@ -159,7 +162,7 @@ public: query, update, false, /* upsert */ - ShardingCatalogClient::kMajorityWriteConcern, + kMajorityWriteConcern, Milliseconds::max())); if (!docWasModified) { diff --git a/src/mongo/db/s/resharding/resharding_recipient_service_external_state.cpp b/src/mongo/db/s/resharding/resharding_recipient_service_external_state.cpp index fc3b553aa18..660c1e84667 100644 --- a/src/mongo/db/s/resharding/resharding_recipient_service_external_state.cpp +++ b/src/mongo/db/s/resharding/resharding_recipient_service_external_state.cpp @@ -33,6 +33,7 @@ #include "mongo/db/s/resharding/resharding_donor_recipient_common.h" #include "mongo/db/s/sharding_state.h" +#include "mongo/db/write_concern_options.h" #include "mongo/logv2/log.h" #include "mongo/s/catalog/sharding_catalog_client.h" #include "mongo/s/catalog_cache.h" @@ -42,6 +43,11 @@ namespace mongo { +namespace { +const WriteConcernOptions kMajorityWriteConcern{ + WriteConcernOptions::kMajority, WriteConcernOptions::SyncMode::UNSET, Seconds(0)}; +} + void ReshardingRecipientService::RecipientStateMachineExternalState:: ensureTempReshardingCollectionExistsWithIndexes(OperationContext* opCtx, const CommonReshardingMetadata& metadata, @@ -160,7 +166,7 @@ void RecipientStateMachineExternalStateImpl::updateCoordinatorDocument(Operation query, update, false, /* upsert */ - ShardingCatalogClient::kMajorityWriteConcern, + kMajorityWriteConcern, Milliseconds::max())); if (!docWasModified) { |