mongodb/mongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SERVER-123935 limit ingress move chunks and conflict generated by concurrent move chunks executed in parallel (#51687)

Browse Source 
GitOrigin-RevId: 3921358bcfd57c2086d08f92727dea5faf2a7e86
This commit is contained in:
nicola cabiddu 2026-04-14 11:47:00 +01:00 committed by MongoDB Bot
parent 87702267d1
commit 765dd09506
33 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_batch_size_1_embedded_watch_cluster.yml
View File

@ -36,6 +36,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
threadOverrides:
- jstests/libs/override_methods/implicitly_retry_on_migration_in_progress.js

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_batch_size_1_embedded_watch_collection.yml
View File

@ -36,6 +36,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
threadOverrides:
- jstests/libs/override_methods/implicitly_retry_on_migration_in_progress.js

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_batch_size_1_embedded_watch_db.yml
View File

@ -36,6 +36,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
threadOverrides:
- jstests/libs/override_methods/implicitly_retry_on_migration_in_progress.js

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_batch_size_1_watch_cluster.yml
View File

@ -35,6 +35,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
threadOverrides:
- jstests/libs/override_methods/implicitly_retry_on_migration_in_progress.js

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_batch_size_1_watch_collection.yml
View File

@ -35,6 +35,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
threadOverrides:
- jstests/libs/override_methods/implicitly_retry_on_migration_in_progress.js

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_batch_size_1_watch_db.yml
View File

@ -35,6 +35,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
threadOverrides:
- jstests/libs/override_methods/implicitly_retry_on_migration_in_progress.js

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_bg_mutator_batch_size_1_embedded_watch_cluster.yml
View File

@ -38,6 +38,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
threadOverrides:
- jstests/libs/override_methods/implicitly_retry_on_migration_in_progress.js

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_bg_mutator_batch_size_1_embedded_watch_collection.yml
View File

@ -38,6 +38,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
threadOverrides:
- jstests/libs/override_methods/implicitly_retry_on_migration_in_progress.js

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_bg_mutator_batch_size_1_embedded_watch_db.yml
View File

@ -38,6 +38,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
threadOverrides:
- jstests/libs/override_methods/implicitly_retry_on_migration_in_progress.js

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_bg_mutator_batch_size_1_watch_cluster.yml
View File

@ -37,6 +37,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
threadOverrides:
- jstests/libs/override_methods/implicitly_retry_on_migration_in_progress.js

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_bg_mutator_batch_size_1_watch_collection.yml
View File

@ -37,6 +37,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
threadOverrides:
- jstests/libs/override_methods/implicitly_retry_on_migration_in_progress.js

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_bg_mutator_batch_size_1_watch_db.yml
View File

@ -37,6 +37,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
threadOverrides:
- jstests/libs/override_methods/implicitly_retry_on_migration_in_progress.js

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_bg_mutator_embedded_watch_cluster.yml
View File

@ -37,6 +37,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
threadOverrides:
- jstests/libs/override_methods/implicitly_retry_on_migration_in_progress.js

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_bg_mutator_embedded_watch_collection.yml
View File

@ -37,6 +37,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
threadOverrides:
- jstests/libs/override_methods/implicitly_retry_on_migration_in_progress.js

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_bg_mutator_embedded_watch_db.yml
View File

@ -37,6 +37,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
threadOverrides:
- jstests/libs/override_methods/implicitly_retry_on_migration_in_progress.js

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_bg_mutator_watch_cluster.yml
View File

@ -36,6 +36,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
threadOverrides:
- jstests/libs/override_methods/implicitly_retry_on_migration_in_progress.js

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_bg_mutator_watch_collection.yml
View File

@ -36,6 +36,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
threadOverrides:
- jstests/libs/override_methods/implicitly_retry_on_migration_in_progress.js

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_bg_mutator_watch_db.yml
View File

@ -36,6 +36,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
threadOverrides:
- jstests/libs/override_methods/implicitly_retry_on_migration_in_progress.js

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_embedded_watch_cluster.yml
View File

@ -35,6 +35,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
threadOverrides:
- jstests/libs/override_methods/implicitly_retry_on_migration_in_progress.js

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_embedded_watch_collection.yml
View File

@ -35,6 +35,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
threadOverrides:
- jstests/libs/override_methods/implicitly_retry_on_migration_in_progress.js

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_embedded_watch_db.yml
View File

@ -35,6 +35,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
threadOverrides:
- jstests/libs/override_methods/implicitly_retry_on_migration_in_progress.js

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_irs_watch_cluster.yml
View File

@ -35,6 +35,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
skipCheckOrphans: true
threadOverrides:

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_irs_watch_collection.yml
View File

@ -33,6 +33,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
skipCheckOrphans: true
threadOverrides:

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_irs_watch_db.yml
View File

@ -35,6 +35,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
skipCheckOrphans: true
threadOverrides:

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_pairwise_irs_watch_cluster.yml
View File

@ -34,6 +34,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
pairwiseIrs: true
threadOverrides:

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_pairwise_irs_watch_collection.yml
View File

@ -34,6 +34,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
pairwiseIrs: true
threadOverrides:

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_pairwise_irs_watch_db.yml
View File

@ -34,6 +34,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
pairwiseIrs: true
threadOverrides:

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_watch_cluster.yml
View File

@ -32,6 +32,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
threadOverrides:
- jstests/libs/override_methods/implicitly_retry_on_migration_in_progress.js

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_watch_collection.yml
View File

@ -32,6 +32,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
threadOverrides:
- jstests/libs/override_methods/implicitly_retry_on_migration_in_progress.js

1
buildscripts/resmokeconfig/matrix_suites/generated_suites/change_streams_sharding_fsm_watch_db.yml
View File

@ -32,6 +32,7 @@ executor:
migrationRetryExtraDDLErrors:
- ReshardCollectionInterruptedDueToFCVChange
- Interrupted
migrationRetryJitterMS: 2000
migrationRetryMatchFCVErrors: true
threadOverrides:
- jstests/libs/override_methods/implicitly_retry_on_migration_in_progress.js

1
buildscripts/resmokeconfig/matrix_suites/overrides/change_streams_sharding_fsm.yml
View File

@ -85,6 +85,7 @@
global_vars:
TestData:
enableBgMutator: true
migrationRetryJitterMS: 2000
migrationRetryExtraDDLCommands:
- "drop"
- "dropDatabase"

1
buildscripts/resmokeconfig/suites/change_streams_sharding_fsm.yml
View File

@ -18,6 +18,7 @@ executor:
await import('jstests/libs/override_methods/implicitly_retry_on_migration_in_progress.js');
global_vars:
TestData:
migrationRetryJitterMS: 2000
migrationRetryExtraDDLCommands:
- "drop"
- "dropDatabase"

7
jstests/libs/override_methods/implicitly_retry_on_migration_in_progress.js
View File

@ -28,6 +28,7 @@ const MigrationRetryConfig = {
]),
queryErrors: new Set([ErrorCodes.QueryPlanKilled]),
matchFCVErrors: TestData.migrationRetryMatchFCVErrors || false,
retryJitterMS: TestData.migrationRetryJitterMS || 0,
};
function _runAndExhaustQueryWithRetryUponMigration(conn, commandName, commandObj, func, makeFuncArgs) {
@ -107,6 +108,10 @@ function _runDDLCommandWithRetryUponMigration(conn, commandName, commandObj, fun
let commandResponse;
let attempt = 0;
let interval;
if (MigrationRetryConfig.retryJitterMS) {
interval = 500 + Math.floor(Math.random() * MigrationRetryConfig.retryJitterMS);
}
assert.soon(
() => {
@ -144,6 +149,8 @@ function _runDDLCommandWithRetryUponMigration(conn, commandName, commandObj, fun
return kNoRetry;
},
() => "Timed out while retrying command '" + tojson(commandObj) + "', response: " + tojson(commandResponse),
undefined,
interval,
);
return commandResponse;