diff options
| author | Luis Osta <luis.osta@mongodb.com> | 2021-10-29 18:57:42 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-11-01 13:39:26 +0000 |
| commit | 1ea5111a46f570d9b805a504d824c6dddff2462c (patch) | |
| tree | 1b2cb9a5af5bfcbb7aa32f8fd8f01c2c9456c540 | |
| parent | f7fdc731424d93367129f5d91064dfd31300f883 (diff) | |
| download | mongo-1ea5111a46f570d9b805a504d824c6dddff2462c.tar.gz | |
SERVER-61108 Remove wtimeout from resharding coordinator write concern
(cherry picked from commit b2531ed72eb81c7a9e4951e4aab93c7d190d3023)
| -rw-r--r-- | src/mongo/db/s/resharding/resharding_coordinator_service.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/mongo/db/s/resharding/resharding_coordinator_service.cpp b/src/mongo/db/s/resharding/resharding_coordinator_service.cpp index caa92bd1e59..e3003540412 100644 --- a/src/mongo/db/s/resharding/resharding_coordinator_service.cpp +++ b/src/mongo/db/s/resharding/resharding_coordinator_service.cpp @@ -94,6 +94,8 @@ MONGO_FAIL_POINT_DEFINE(pauseBeforeInsertCoordinatorDoc); const std::string kReshardingCoordinatorActiveIndexName = "ReshardingCoordinatorActiveIndex"; const Backoff kExponentialBackoff(Seconds(1), Milliseconds::max()); +const WriteConcernOptions kMajorityWriteConcern{ + WriteConcernOptions::kMajority, WriteConcernOptions::SyncMode::UNSET, Seconds(0)}; bool shouldStopAttemptingToCreateIndex(Status status, const CancellationToken& token) { return status.isOK() || token.isCanceled(); @@ -509,13 +511,9 @@ void removeChunkAndTagsDocs(OperationContext* opCtx, const auto catalogClient = Grid::get(opCtx)->catalogClient(); uassertStatusOK(catalogClient->removeConfigDocuments( - opCtx, ChunkType::ConfigNS, chunksQuery, ShardingCatalogClient::kMajorityWriteConcern)); - uassertStatusOK( - catalogClient->removeConfigDocuments(opCtx, - TagsType::ConfigNS, - tagsQuery, - ShardingCatalogClient::kMajorityWriteConcern, - tagDeleteOperationHint)); + opCtx, ChunkType::ConfigNS, chunksQuery, kMajorityWriteConcern)); + uassertStatusOK(catalogClient->removeConfigDocuments( + opCtx, TagsType::ConfigNS, tagsQuery, kMajorityWriteConcern, tagDeleteOperationHint)); } void updateChunkAndTagsDocsForTempNss(OperationContext* opCtx, @@ -555,7 +553,8 @@ BSONObj makeFlushRoutingTableCacheUpdatesCmd(const NamespaceString& nss) { auto cmd = _flushRoutingTableCacheUpdatesWithWriteConcern(nss); cmd.setSyncFromConfig(true); cmd.setDbName(nss.db()); - return CommandHelpers::appendMajorityWriteConcern(cmd.toBSON({})).getOwned(); + return cmd.toBSON( + BSON(WriteConcernOptions::kWriteConcernField << kMajorityWriteConcern.toBSON())); } } // namespace @@ -762,7 +761,7 @@ void removeCoordinatorDocAndReshardingFields(OperationContext* opCtx, opCtx, CollectionType::ConfigNS, BSON(CollectionType::kNssFieldName << coordinatorDoc.getTempReshardingNss().ns()), - ShardingCatalogClient::kMajorityWriteConcern)); + kMajorityWriteConcern)); removeChunkAndTagsDocs(opCtx, tagsQuery, coordinatorDoc.getReshardingUUID()); } @@ -1006,7 +1005,7 @@ void ReshardingCoordinatorService::ReshardingCoordinator::installCoordinatorDoc( "resharding.coordinator.transition", doc.getSourceNss().toString(), bob.obj(), - ShardingCatalogClient::kMajorityWriteConcern); + kMajorityWriteConcern); } void markCompleted(const Status& status) { |