diff options
| author | Allison Easton <allison.easton@mongodb.com> | 2023-05-10 13:18:04 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2023-05-10 14:31:47 +0000 |
| commit | 48be174f68488b8e0c5695081afe1d41260a259f (patch) | |
| tree | 03abf412b66e0ea1a8935b7d64a79c4cf531d50e /src/mongo/db/s | |
| parent | e6b0b4376c7c6ca66cba6478bfb1f0aa63d6c33f (diff) | |
| download | mongo-48be174f68488b8e0c5695081afe1d41260a259f.tar.gz | |
SERVER-73866 Re-enable agg_merge_when_not_matched_insert.js in config_fuzzer passthrough suites
Diffstat (limited to 'src/mongo/db/s')
| -rw-r--r-- | src/mongo/db/s/migration_chunk_cloner_source.cpp | 3 | ||||
| -rw-r--r-- | src/mongo/db/s/sharding_runtime_d_params.idl | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/mongo/db/s/migration_chunk_cloner_source.cpp b/src/mongo/db/s/migration_chunk_cloner_source.cpp index 48720ed71fe..25b80b3c8a1 100644 --- a/src/mongo/db/s/migration_chunk_cloner_source.cpp +++ b/src/mongo/db/s/migration_chunk_cloner_source.cpp @@ -1264,7 +1264,8 @@ Status MigrationChunkClonerSource::_checkRecipientCloningStatus(OperationContext _args.getMaxChunkSizeBytes(); int64_t maxUntransferredSessionsSize = BSONObjMaxUserSize * _args.getMaxChunkSizeBytes() / ChunkSizeSettingsType::kDefaultMaxChunkSizeBytes; - if (estimatedUntransferredChunkPercentage < maxCatchUpPercentageBeforeBlockingWrites && + if (estimatedUntransferredChunkPercentage < + maxCatchUpPercentageBeforeBlockingWrites.load() && estimateUntransferredSessionsSize < maxUntransferredSessionsSize) { // The recipient is sufficiently caught-up with the writes on the donor. // Block writes, so that it can drain everything. diff --git a/src/mongo/db/s/sharding_runtime_d_params.idl b/src/mongo/db/s/sharding_runtime_d_params.idl index af5722d6f6f..a622e883e06 100644 --- a/src/mongo/db/s/sharding_runtime_d_params.idl +++ b/src/mongo/db/s/sharding_runtime_d_params.idl @@ -116,8 +116,8 @@ server_parameters: The maximum percentage of untrasferred chunk mods at the end of a catch up iteration that may be deferred to the next phase of the migration protocol (where new writes get blocked). - set_at: [startup] - cpp_vartype: int + set_at: [startup, runtime] + cpp_vartype: AtomicWord<int> cpp_varname: maxCatchUpPercentageBeforeBlockingWrites validator: gte: 0 |