diff options
| author | Yuhong Zhang <danielzhangyh@gmail.com> | 2021-10-01 19:26:39 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-10-01 19:59:04 +0000 |
| commit | db6917f43bed5127eb04ca6db64f57ddde0cac54 (patch) | |
| tree | 2206bb0a5207e8e325ded082641a324a001563bf | |
| parent | fac8064540ae6159bb010ef6f71947e749be3e9f (diff) | |
| download | mongo-db6917f43bed5127eb04ca6db64f57ddde0cac54.tar.gz | |
SERVER-59042 Remove special handling of index build bulk load lock yielding for multiversion tests after backports
4 files changed, 2 insertions, 10 deletions
diff --git a/jstests/replsets/libs/rollback_resumable_index_build.js b/jstests/replsets/libs/rollback_resumable_index_build.js index fe970e105fa..5420b45ddb0 100644 --- a/jstests/replsets/libs/rollback_resumable_index_build.js +++ b/jstests/replsets/libs/rollback_resumable_index_build.js @@ -87,13 +87,8 @@ const RollbackResumableIndexBuildTest = class { // their locks between the rollback end and start failpoints. assert.commandWorked( originalPrimary.adminCommand({setParameter: 1, internalQueryExecYieldIterations: 0})); - // TODO (SERVER-59042): Remove special handling of index build bulk load lock yielding for - // multiversion tests after backports. - let res = originalPrimary.adminCommand( - {setParameter: 1, internalIndexBuildBulkLoadYieldIterations: 1}); - if (res.ok || !res.errmsg.includes("unrecognized parameter")) { - assert.commandWorked(res); - } + assert.commandWorked(originalPrimary.adminCommand( + {setParameter: 1, internalIndexBuildBulkLoadYieldIterations: 1})); assert.commandWorked( originalPrimary.adminCommand({setParameter: 1, maxIndexBuildDrainBatchSize: 1})); diff --git a/jstests/replsets/rollback_resumable_index_build_bulk_load_phase.js b/jstests/replsets/rollback_resumable_index_build_bulk_load_phase.js index e0b12bf3c37..60866a6cf49 100644 --- a/jstests/replsets/rollback_resumable_index_build_bulk_load_phase.js +++ b/jstests/replsets/rollback_resumable_index_build_bulk_load_phase.js @@ -3,7 +3,6 @@ * the bulk load phase. * * @tags: [ - * requires_fcv_51, * requires_majority_read_concern, * requires_persistence, * ] diff --git a/jstests/replsets/rollback_resumable_index_build_bulk_load_phase_large.js b/jstests/replsets/rollback_resumable_index_build_bulk_load_phase_large.js index d6e0ec45752..db6f74998a0 100644 --- a/jstests/replsets/rollback_resumable_index_build_bulk_load_phase_large.js +++ b/jstests/replsets/rollback_resumable_index_build_bulk_load_phase_large.js @@ -3,7 +3,6 @@ * phase completes properly after being interrupted for rollback during the bulk load phase. * * @tags: [ - * requires_fcv_51, * requires_majority_read_concern, * requires_persistence, * ] diff --git a/jstests/replsets/rollback_resumable_index_build_mixed_phases.js b/jstests/replsets/rollback_resumable_index_build_mixed_phases.js index e0442383848..8bbc14a5752 100644 --- a/jstests/replsets/rollback_resumable_index_build_mixed_phases.js +++ b/jstests/replsets/rollback_resumable_index_build_mixed_phases.js @@ -3,7 +3,6 @@ * different phases. * * @tags: [ - * requires_fcv_51, * requires_majority_read_concern, * requires_persistence, * ] |