From 1df41757d5d1e04c51eeeee786a17b005e025b93 Mon Sep 17 00:00:00 2001 From: Jack Mulrow Date: Thu, 16 Apr 2020 12:52:36 -0400 Subject: SERVER-33229 Blacklist tests that use startParallelShell from failover core suites --- .../suites/replica_sets_kill_primary_jscore_passthrough.yml | 13 +++++-------- ..._sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml | 12 +++++------- ...lica_sets_multi_stmt_txn_stepdown_jscore_passthrough.yml | 12 +++++------- ..._multi_stmt_txn_terminate_primary_jscore_passthrough.yml | 12 +++++------- .../replica_sets_reconfig_jscore_stepdown_passthrough.yml | 5 +++++ ...eplica_sets_reconfig_kill_primary_jscore_passthrough.yml | 11 +++++------ .../replica_sets_terminate_primary_jscore_passthrough.yml | 13 +++++-------- .../suites/retryable_writes_jscore_stepdown_passthrough.yml | 5 +++++ jstests/core/awaitdata_getmore_cmd.js | 1 + jstests/core/background_validation.js | 11 ++++++----- jstests/core/comment_field.js | 13 ++++++++++--- jstests/core/compact_keeps_indexes.js | 1 + jstests/core/count10.js | 1 + jstests/core/count_plan_summary.js | 1 + jstests/core/coveredIndex3.js | 3 +++ jstests/core/crud_ops_do_not_throw_locktimeout.js | 13 ++++++++----- jstests/core/currentop.js | 1 + jstests/core/cursora.js | 1 + jstests/core/distinct3.js | 1 + jstests/core/find_and_modify_concurrent_update.js | 1 + jstests/core/fsync.js | 6 +++++- jstests/core/geo_update_btree.js | 1 + jstests/core/killop_drop_collection.js | 1 + jstests/core/loadserverscripts.js | 1 + jstests/core/mr_killop.js | 3 ++- jstests/core/remove9.js | 1 + jstests/core/removeb.js | 1 + jstests/core/removec.js | 1 + jstests/core/shellstartparallel.js | 1 + jstests/core/updatef.js | 1 + .../libs/override_methods/network_error_and_txn_override.js | 12 +++++++----- 31 files changed, 97 insertions(+), 63 deletions(-) diff --git a/buildscripts/resmokeconfig/suites/replica_sets_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_kill_primary_jscore_passthrough.yml index c87c59009e6..eae05e8b770 100644 --- a/buildscripts/resmokeconfig/suites/replica_sets_kill_primary_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/replica_sets_kill_primary_jscore_passthrough.yml @@ -68,13 +68,6 @@ selector: # Creates new mongo connection but won't retry connecting. - jstests/core/shell_connection_strings.js - # Starts a parallel shell but won't restart it after unclean shutdown. - # TODO SERVER-33229: Remove these exclusions - - jstests/core/compact_keeps_indexes.js - - jstests/core/crud_ops_do_not_throw_locktimeout.js - - jstests/core/find_and_modify_concurrent_update.js - - jstests/core/shellstartparallel.js - # Inserts enough data that recovery takes more than 8 seconds, so we never get a working primary. - jstests/core/geo_s2ordering.js @@ -129,6 +122,11 @@ selector: ## The next tag corresponds to long running-operations, as they may exhaust their number # of retries and result in a network error being thrown. - operations_longer_than_stepdown_interval + # Operations in the main test shell aren't guaranteed to be causally consistent with operations + # performed earlier in a parallel shell if multiple nodes are electable because the latest + # operation and cluster times aren't shared between shells. + # "Cowardly refusing to run test with network retries enabled when it uses startParallelShell()" + - uses_parallel_shell executor: archive: @@ -139,7 +137,6 @@ executor: - ValidateCollections config: shell_options: - # TODO SERVER-33229: Remove override of startParallelShell eval: >- testingReplication = true; load('jstests/libs/override_methods/network_error_and_txn_override.js'); diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml index 13008c98bd4..6f535d3d154 100644 --- a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml @@ -252,12 +252,6 @@ selector: # Creates new mongo connection but won't retry connecting. - jstests/core/shell_connection_strings.js - # Starts a parallel shell but won't restart it after shutdown. - # TODO SERVER-33229: Remove these exclusions - - jstests/core/compact_keeps_indexes.js - - jstests/core/find_and_modify_concurrent_update.js - - jstests/core/shellstartparallel.js - # TODO SERVER-31242: findAndModify no-op retry should respect the fields option. - jstests/core/crud_api.js - jstests/core/find_and_modify.js @@ -329,9 +323,13 @@ selector: - requires_profiling # Retrying a query can change whether a plan cache entry is active. - inspects_whether_plan_cache_entry_is_active - # $out is not supported in transactions - uses_$out + # Operations in the main test shell aren't guaranteed to be causally consistent with operations + # performed earlier in a parallel shell if multiple nodes are electable because the latest + # operation and cluster times aren't shared between shells. + # "Cowardly refusing to run test with network retries enabled when it uses startParallelShell()" + - uses_parallel_shell executor: archive: diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_stepdown_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_stepdown_jscore_passthrough.yml index e68855ec6c2..c6b41120c4f 100644 --- a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_stepdown_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_stepdown_jscore_passthrough.yml @@ -253,12 +253,6 @@ selector: # Creates new mongo connection but won't retry connecting. - jstests/core/shell_connection_strings.js - # Starts a parallel shell but won't restart it after shutdown. - # TODO SERVER-33229: Remove these exclusions - - jstests/core/compact_keeps_indexes.js - - jstests/core/find_and_modify_concurrent_update.js - - jstests/core/shellstartparallel.js - # Does not support tojson of command objects. - jstests/core/SERVER-23626.js @@ -311,9 +305,13 @@ selector: - requires_profiling # Retrying a query can change whether a plan cache entry is active. - inspects_whether_plan_cache_entry_is_active - # $out is not supported in transactions - uses_$out + # Operations in the main test shell aren't guaranteed to be causally consistent with operations + # performed earlier in a parallel shell if multiple nodes are electable because the latest + # operation and cluster times aren't shared between shells. + # "Cowardly refusing to run test with network retries enabled when it uses startParallelShell()" + - uses_parallel_shell executor: archive: diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml index 43a03920215..6a74ccd058c 100644 --- a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml @@ -250,12 +250,6 @@ selector: # Creates new mongo connection but won't retry connecting. - jstests/core/shell_connection_strings.js - # Starts a parallel shell but won't restart it after shutdown. - # TODO SERVER-33229: Remove these exclusions - - jstests/core/compact_keeps_indexes.js - - jstests/core/find_and_modify_concurrent_update.js - - jstests/core/shellstartparallel.js - # TODO SERVER-31242: findAndModify no-op retry should respect the fields option. - jstests/core/crud_api.js - jstests/core/find_and_modify.js @@ -318,9 +312,13 @@ selector: - requires_profiling # Retrying a query can change whether a plan cache entry is active. - inspects_whether_plan_cache_entry_is_active - # $out is not supported in transactions - uses_$out + # Operations in the main test shell aren't guaranteed to be causally consistent with operations + # performed earlier in a parallel shell if multiple nodes are electable because the latest + # operation and cluster times aren't shared between shells. + # "Cowardly refusing to run test with network retries enabled when it uses startParallelShell()" + - uses_parallel_shell executor: archive: diff --git a/buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_stepdown_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_stepdown_passthrough.yml index d221ccba640..3e46fc34d83 100644 --- a/buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_stepdown_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_stepdown_passthrough.yml @@ -134,6 +134,11 @@ selector: - requires_dbstats - requires_datasize - requires_sharding + # Operations in the main test shell aren't guaranteed to be causally consistent with operations + # performed earlier in a parallel shell if multiple nodes are electable because the latest + # operation and cluster times aren't shared between shells. + # "Cowardly refusing to run test with network retries enabled when it uses startParallelShell()" + - uses_parallel_shell executor: archive: diff --git a/buildscripts/resmokeconfig/suites/replica_sets_reconfig_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_reconfig_kill_primary_jscore_passthrough.yml index 6c973e3dd06..af62048e80c 100644 --- a/buildscripts/resmokeconfig/suites/replica_sets_reconfig_kill_primary_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/replica_sets_reconfig_kill_primary_jscore_passthrough.yml @@ -86,12 +86,6 @@ selector: # Tests that fail for Causal Consistency as they have statements that do not support # non-local read concern. - jstests/core/collation.js - # Starts a parallel shell but won't restart it after unclean shutdown. - # TODO SERVER-33229: Remove these exclusions - - jstests/core/compact_keeps_indexes.js - - jstests/core/benchrun_pipeline_updates.js - - jstests/core/find_and_modify_concurrent_update.js - - jstests/core/shellstartparallel.js # Inserts enough data that recovery takes more than 8 seconds, so we never get a working primary. - jstests/core/geo_s2ordering.js @@ -147,6 +141,11 @@ selector: ## The next tag corresponds to long running-operations, as they may exhaust their number # of retries and result in a network error being thrown. - operations_longer_than_stepdown_interval + # Operations in the main test shell aren't guaranteed to be causally consistent with operations + # performed earlier in a parallel shell if multiple nodes are electable because the latest + # operation and cluster times aren't shared between shells. + # "Cowardly refusing to run test with network retries enabled when it uses startParallelShell()" + - uses_parallel_shell executor: archive: diff --git a/buildscripts/resmokeconfig/suites/replica_sets_terminate_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_terminate_primary_jscore_passthrough.yml index 870e55db89e..8a2b8aa621e 100644 --- a/buildscripts/resmokeconfig/suites/replica_sets_terminate_primary_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/replica_sets_terminate_primary_jscore_passthrough.yml @@ -68,13 +68,6 @@ selector: # Creates new mongo connection but won't retry connecting. - jstests/core/shell_connection_strings.js - # Starts a parallel shell but won't restart it after shutdown. - # TODO SERVER-33229: Remove these exclusions - - jstests/core/compact_keeps_indexes.js - - jstests/core/crud_ops_do_not_throw_locktimeout.js - - jstests/core/find_and_modify_concurrent_update.js - - jstests/core/shellstartparallel.js - exclude_with_any_tags: ## # The next four tags correspond to the special errors thrown by the auto_retry_on_network_error.js @@ -114,6 +107,11 @@ selector: - operations_longer_than_stepdown_interval # Retrying a query can change whether a plan cache entry is active. - inspects_whether_plan_cache_entry_is_active + # Operations in the main test shell aren't guaranteed to be causally consistent with operations + # performed earlier in a parallel shell if multiple nodes are electable because the latest + # operation and cluster times aren't shared between shells. + # "Cowardly refusing to run test with network retries enabled when it uses startParallelShell()" + - uses_parallel_shell executor: archive: @@ -123,7 +121,6 @@ executor: - ValidateCollections config: shell_options: - # TODO SERVER-33229: Remove override of startParallelShell eval: >- testingReplication = true; load("jstests/libs/override_methods/causally_consistent_index_builds.js"); diff --git a/buildscripts/resmokeconfig/suites/retryable_writes_jscore_stepdown_passthrough.yml b/buildscripts/resmokeconfig/suites/retryable_writes_jscore_stepdown_passthrough.yml index 0db6dd53eb7..fe733ac1e22 100644 --- a/buildscripts/resmokeconfig/suites/retryable_writes_jscore_stepdown_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/retryable_writes_jscore_stepdown_passthrough.yml @@ -105,6 +105,11 @@ selector: ## The next tag corresponds to long running-operations, as they may exhaust their number # of retries and result in a network error being thrown. - operations_longer_than_stepdown_interval + # Operations in the main test shell aren't guaranteed to be causally consistent with operations + # performed earlier in a parallel shell if multiple nodes are electable because the latest + # operation and cluster times aren't shared between shells. + # "Cowardly refusing to run test with network retries enabled when it uses startParallelShell()" + - uses_parallel_shell executor: archive: diff --git a/jstests/core/awaitdata_getmore_cmd.js b/jstests/core/awaitdata_getmore_cmd.js index d142615fa94..fae96fbdc91 100644 --- a/jstests/core/awaitdata_getmore_cmd.js +++ b/jstests/core/awaitdata_getmore_cmd.js @@ -8,6 +8,7 @@ // requires_capped, // requires_getmore, // uses_multiple_connections, +// uses_parallel_shell, // ] (function() { diff --git a/jstests/core/background_validation.js b/jstests/core/background_validation.js index b786df9b57d..3791f4d7dce 100644 --- a/jstests/core/background_validation.js +++ b/jstests/core/background_validation.js @@ -6,10 +6,6 @@ * Checks that {background:true} can run concurrently with CRUD ops on the same collection. * * @tags: [ - * # Background validation is only supported by WT. - * requires_wiredtiger, - * # inMemory does not have checkpoints; background validation only runs on a checkpoint. - * requires_persistence, * # A failpoint is set that only exists on the mongod. * assumes_against_mongod_not_mongos, * # A failpoint is set against the primary only. @@ -17,7 +13,12 @@ * # Checkpoint cursors cannot be open in lsm. * does_not_support_wiredtiger_lsm, * # Background validation will be first available in v4.4. - * requires_fcv_44 + * requires_fcv_44, + * # inMemory does not have checkpoints; background validation only runs on a checkpoint. + * requires_persistence, + * # Background validation is only supported by WT. + * requires_wiredtiger, + * uses_parallel_shell, * ] */ diff --git a/jstests/core/comment_field.js b/jstests/core/comment_field.js index 755ac35fbd9..036c11a19c1 100644 --- a/jstests/core/comment_field.js +++ b/jstests/core/comment_field.js @@ -1,9 +1,16 @@ /** * Test to verify that the 'comment' field set while running a command gets populated in $currentOp * and profiler. - * @tags: [assumes_against_mongod_not_mongos, assumes_unsharded_collection, - * does_not_support_stepdowns, requires_profiling, assumes_read_concern_unchanged, - * assumes_write_concern_unchanged, requires_fcv_44] + * @tags: [ + * assumes_against_mongod_not_mongos, + * assumes_read_concern_unchanged, + * assumes_unsharded_collection, + * assumes_write_concern_unchanged, + * does_not_support_stepdowns, + * requires_fcv_44, + * requires_profiling, + * uses_parallel_shell, + * ] */ (function() { diff --git a/jstests/core/compact_keeps_indexes.js b/jstests/core/compact_keeps_indexes.js index 25b3909df1c..4371513b3d9 100644 --- a/jstests/core/compact_keeps_indexes.js +++ b/jstests/core/compact_keeps_indexes.js @@ -5,6 +5,7 @@ // # compact command is not available on embedded // incompatible_with_embedded, // uses_multiple_connections, +// uses_parallel_shell, // ] (function() { diff --git a/jstests/core/count10.js b/jstests/core/count10.js index 63c788c15a6..1e8a5890610 100644 --- a/jstests/core/count10.js +++ b/jstests/core/count10.js @@ -9,6 +9,7 @@ // # Uses $where operator // requires_scripting, // uses_multiple_connections, +// uses_parallel_shell, // ] t = db.count10; diff --git a/jstests/core/count_plan_summary.js b/jstests/core/count_plan_summary.js index ed30956d917..bd2fd3a8824 100644 --- a/jstests/core/count_plan_summary.js +++ b/jstests/core/count_plan_summary.js @@ -9,6 +9,7 @@ // # Uses $where operator // requires_scripting, // uses_multiple_connections, +// uses_parallel_shell, // ] var t = db.jstests_count_plan_summary; diff --git a/jstests/core/coveredIndex3.js b/jstests/core/coveredIndex3.js index 3a6621a2a72..a054840b6df 100644 --- a/jstests/core/coveredIndex3.js +++ b/jstests/core/coveredIndex3.js @@ -1,5 +1,8 @@ // Check proper covered index handling when query and processGetMore yield. // SERVER-4975 +// @tags: [ +// uses_parallel_shell, +// ] if (0) { // SERVER-4975 diff --git a/jstests/core/crud_ops_do_not_throw_locktimeout.js b/jstests/core/crud_ops_do_not_throw_locktimeout.js index e8c3a447cb1..ceac45641cf 100644 --- a/jstests/core/crud_ops_do_not_throw_locktimeout.js +++ b/jstests/core/crud_ops_do_not_throw_locktimeout.js @@ -1,11 +1,14 @@ /** * Tests that CRUD operations do not throw lock timeouts outside of transactions. * - * @tags: [assumes_against_mongod_not_mongos, - * assumes_read_concern_unchanged, - * assumes_write_concern_unchanged, - * # This test requires failpoint behavior not available in v4.2. - * requires_fcv_44] + * @tags: [ + * assumes_against_mongod_not_mongos, + * assumes_read_concern_unchanged, + * assumes_write_concern_unchanged, + * # This test requires failpoint behavior not available in v4.2. + * requires_fcv_44, + * uses_parallel_shell, + * ] */ (function() { "use strict"; diff --git a/jstests/core/currentop.js b/jstests/core/currentop.js index 379d2afd800..41c2e36110f 100644 --- a/jstests/core/currentop.js +++ b/jstests/core/currentop.js @@ -5,6 +5,7 @@ * assumes_superuser_permissions, * # fsync command is not available on embedded * incompatible_with_embedded, + * uses_parallel_shell, * ] */ diff --git a/jstests/core/cursora.js b/jstests/core/cursora.js index a4c6e94595b..4176e4d42fb 100644 --- a/jstests/core/cursora.js +++ b/jstests/core/cursora.js @@ -5,6 +5,7 @@ // # Uses $where operator // requires_scripting, // uses_multiple_connections, +// uses_parallel_shell, // ] (function() { diff --git a/jstests/core/distinct3.js b/jstests/core/distinct3.js index ba1b3182542..9106927aade 100644 --- a/jstests/core/distinct3.js +++ b/jstests/core/distinct3.js @@ -1,6 +1,7 @@ // @tags: [ // requires_non_retryable_writes, // uses_multiple_connections, +// uses_parallel_shell, // ] // Yield and delete test case for query optimizer cursor. SERVER-4401 diff --git a/jstests/core/find_and_modify_concurrent_update.js b/jstests/core/find_and_modify_concurrent_update.js index bc7472259c4..f1ac1282b49 100644 --- a/jstests/core/find_and_modify_concurrent_update.js +++ b/jstests/core/find_and_modify_concurrent_update.js @@ -6,6 +6,7 @@ // # Uses $where operator // requires_scripting, // uses_multiple_connections, +// uses_parallel_shell, // ] // Ensures that find and modify will not apply an update to a document which, due to a concurrent diff --git a/jstests/core/fsync.js b/jstests/core/fsync.js index ec2a775c992..2c721af08e9 100644 --- a/jstests/core/fsync.js +++ b/jstests/core/fsync.js @@ -6,7 +6,11 @@ * - Confirm that writes can progress after fsyncUnlock * - Confirm that the command can be run repeatedly without breaking things * - * @tags: [requires_fastcount, requires_fsync] + * @tags: [ + * requires_fastcount, + * requires_fsync, + * uses_parallel_shell, + * ] */ (function() { "use strict"; diff --git a/jstests/core/geo_update_btree.js b/jstests/core/geo_update_btree.js index 981f0c629c3..8cf711a9e48 100644 --- a/jstests/core/geo_update_btree.js +++ b/jstests/core/geo_update_btree.js @@ -4,6 +4,7 @@ // assumes_write_concern_unchanged, // requires_non_retryable_writes, // uses_multiple_connections, +// uses_parallel_shell, // ] var coll = db.getCollection("jstests_geo_update_btree"); diff --git a/jstests/core/killop_drop_collection.js b/jstests/core/killop_drop_collection.js index a25bce9b2d6..f589aff89e8 100644 --- a/jstests/core/killop_drop_collection.js +++ b/jstests/core/killop_drop_collection.js @@ -8,6 +8,7 @@ * assumes_superuser_permissions, * # Uses index building in background * requires_background_index, + * uses_parallel_shell, * ] */ (function() { diff --git a/jstests/core/loadserverscripts.js b/jstests/core/loadserverscripts.js index a2373a33dc8..641a07245fe 100644 --- a/jstests/core/loadserverscripts.js +++ b/jstests/core/loadserverscripts.js @@ -2,6 +2,7 @@ // requires_fastcount, // requires_non_retryable_writes, // uses_multiple_connections, +// uses_parallel_shell, // ] // Test db.loadServerScripts() diff --git a/jstests/core/mr_killop.js b/jstests/core/mr_killop.js index 4e28b9d86b9..925da1118b8 100644 --- a/jstests/core/mr_killop.js +++ b/jstests/core/mr_killop.js @@ -3,8 +3,9 @@ // # mapReduce does not support afterClusterTime. // does_not_support_causal_consistency, // does_not_support_stepdowns, -// uses_multiple_connections, // uses_map_reduce_with_temp_collections, +// uses_multiple_connections, +// uses_parallel_shell, // ] (function() { "use strict"; diff --git a/jstests/core/remove9.js b/jstests/core/remove9.js index 8756991e25e..c18468641e0 100644 --- a/jstests/core/remove9.js +++ b/jstests/core/remove9.js @@ -2,6 +2,7 @@ // requires_getmore, // requires_non_retryable_writes, // uses_multiple_connections, +// uses_parallel_shell, // ] // SERVER-2009 Count odd numbered entries while updating and deleting even numbered entries. diff --git a/jstests/core/removeb.js b/jstests/core/removeb.js index eb8aafd65f9..b81c0818d21 100644 --- a/jstests/core/removeb.js +++ b/jstests/core/removeb.js @@ -2,6 +2,7 @@ // requires_fastcount, // requires_non_retryable_writes, // uses_multiple_connections, +// uses_parallel_shell, // ] // Test removal of Records that have been reused since the remove operation began. SERVER-5198 diff --git a/jstests/core/removec.js b/jstests/core/removec.js index 0e5d3e65ad2..500437e8891 100644 --- a/jstests/core/removec.js +++ b/jstests/core/removec.js @@ -1,6 +1,7 @@ // @tags: [ // requires_non_retryable_writes, // uses_multiple_connections, +// uses_parallel_shell, // ] // Sanity test for removing documents with adjacent index keys. SERVER-2008 diff --git a/jstests/core/shellstartparallel.js b/jstests/core/shellstartparallel.js index 947ddf24bf4..e86d4690401 100644 --- a/jstests/core/shellstartparallel.js +++ b/jstests/core/shellstartparallel.js @@ -1,6 +1,7 @@ // @tags: [ // requires_fastcount, // uses_multiple_connections, +// uses_parallel_shell, // ] function f() { diff --git a/jstests/core/updatef.js b/jstests/core/updatef.js index 75b61e299cd..6597484f78a 100644 --- a/jstests/core/updatef.js +++ b/jstests/core/updatef.js @@ -2,6 +2,7 @@ // requires_non_retryable_commands, // requires_non_retryable_writes, // uses_multiple_connections, +// uses_parallel_shell, // ] // Test unsafe management of nsdt on update command yield SERVER-3208 diff --git a/jstests/libs/override_methods/network_error_and_txn_override.js b/jstests/libs/override_methods/network_error_and_txn_override.js index 9307b90b3a5..f4cb7cd6c90 100644 --- a/jstests/libs/override_methods/network_error_and_txn_override.js +++ b/jstests/libs/override_methods/network_error_and_txn_override.js @@ -1109,9 +1109,6 @@ function runCommandOverride(conn, dbName, cmdName, cmdObj, clientFunction, makeF } if (configuredForNetworkRetry()) { - OverrideHelpers.prependOverrideInParallelShell( - "jstests/libs/override_methods/network_error_and_txn_override.js"); - const connectOriginal = connect; connect = function(url, user, pass) { @@ -1140,13 +1137,18 @@ if (configuredForNetworkRetry()) { throw new Error( "logout() isn't resilient to network errors. Please add requires_non_retryable_commands to your test"); }; + + startParallelShell = function() { + throw new Error("Cowardly refusing to run test with network retries enabled when it uses " + + "startParallelShell()"); + }; } if (configuredForTxnOverride()) { startParallelShell = function() { throw new Error( - "Cowardly refusing to run test with transaction override enabled when it uses" + - "startParalleShell()"); + "Cowardly refusing to run test with transaction override enabled when it uses " + + "startParallelShell()"); }; } -- cgit v1.2.1