diff options
author | Uladzimir Makouski <uladzimir.makouski@mongodb.com> | 2022-10-03 08:01:12 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-10-03 08:35:11 +0000 |
commit | 643d02696daf385ec5ea0abbaa6ee656eb82d74d (patch) | |
tree | 3b69538c37f52c508d236d95b08998e698f9bec1 | |
parent | c9d5acc5205f196f9a7726723b11b9abd822d1c2 (diff) | |
download | mongo-643d02696daf385ec5ea0abbaa6ee656eb82d74d.tar.gz |
Revert "SERVER-69672 Disable remaining failing debug mode tests"
This reverts commit b057a5eee2c22e8fd60f15fb9453657041303670.
-rw-r--r-- | etc/evergreen.yml | 93 | ||||
-rw-r--r-- | etc/evergreen_yml_components/definitions.yml | 70 | ||||
-rw-r--r-- | jstests/aggregation/sources/setWindowFields/spill_to_disk.js | 2 | ||||
-rw-r--r-- | jstests/auth/validate_sasl_mechanism.js | 2 | ||||
-rw-r--r-- | jstests/noPassthrough/predictive_connpool.js | 2 | ||||
-rw-r--r-- | src/mongo/shell/assert.js | 16 |
6 files changed, 46 insertions, 139 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index aef5e22a8f8..782667be1ad 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -1569,99 +1569,6 @@ buildvariants: --use-glibcxx-debug --dbg=on --allocator=system - exec_timeout_secs: 32400 # 9 hour timeout - timeout_secs: 18000 # 5 hour idle timeout - tasks: - - name: compile_test_and_package_parallel_core_stream_TG - distros: - - rhel80-xlarge - - name: compile_test_and_package_parallel_unittest_stream_TG - distros: - - rhel80-xlarge - - name: compile_test_and_package_parallel_dbtest_stream_TG - distros: - - rhel80-xlarge - - name: test_api_version_compatibility - - name: .aggfuzzer !.feature_flag_guarded !.no_debug_mode - - name: .aggregation !.feature_flag_guarded !.no_debug_mode - - name: audit - - name: .auth !.no_debug_mode - - name: .causally_consistent !.sharding - - name: .change_streams !.no_debug_mode - - name: .change_stream_fuzzer - - name: .misc_js !.no_debug_mode - - name: .concurrency !.large !.ubsan !.no_txns !.debug_only !.no_debug_mode - - name: .concurrency .large !.ubsan !.no_txns !.debug_only !.no_debug_mode - distros: - - rhel80-medium - - name: config_fuzzer_concurrency - - name: config_fuzzer_jsCore - - name: config_fuzzer_replica_sets_jscore_passthrough - distros: - - rhel80-large - - name: disk_wiredtiger - - name: .encrypt !.no_debug_mode - - name: idl_tests - - name: initial_sync_fuzzer_gen - - name: .integration - distros: - - rhel80-medium - - name: jsCore - distros: - - rhel80-xlarge - - name: .jscore .common !jsCore - - name: jsCore_minimum_batch_size - - name: jsCore_txns_large_txns_format - - name: json_schema - # TODO(SERVER-69996) reenable after ticket is complete - # - name: .jstestfuzz !.flow_control - - name: libunwind_tests - - name: .multiversion_sanity_check - - name: mqlrun - - name: .multi_shard !.no_debug_mode - - name: multiversion_gen - - name: .query_fuzzer - - name: .read_write_concern .large - distros: - - rhel80-medium - - name: .read_write_concern !.large - # TODO(SERVER-69951) reenable after ticket is complete - # - name: .replica_sets !.encrypt !.auth - # distros: - # - rhel80-xlarge - - name: replica_sets_api_version_jscore_passthrough_gen - - name: replica_sets_reconfig_jscore_passthrough_gen - - name: replica_sets_reconfig_kill_primary_jscore_passthrough_gen - distros: - - rhel80-xlarge - - name: retryable_writes_jscore_passthrough_gen - - name: .read_only - - name: .rollbackfuzzer - - name: sasl - - name: search - - name: search_auth - - name: search_ssl - - name: session_jscore_passthrough - - name: .sharding .jscore !.wo_snapshot !.multi_stmt !.no_debug_mode - - name: sharding_api_version_jscore_passthrough_gen - - name: .stitch - - name: .crypt - distros: - - rhel80-xlarge - - name: crypt_build_debug_and_test - distros: - - rhel80-xlarge - - name: .updatefuzzer !.no_debug_mode - - name: secondary_reads_passthrough_gen - - name: server_discovery_and_monitoring_json_test_TG - # TODO(SERVER-70015) reenable after ticket is complete - # - name: .serverless - # distros: - # - rhel80-xlarge - - name: server_selection_json_test_TG - distros: - - rhel80-xlarge - - name: generate_buildid_to_debug_symbols_mapping - &enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required-template name: enterprise-rhel-80-64-bit-dynamic-all-feature-flags-required diff --git a/etc/evergreen_yml_components/definitions.yml b/etc/evergreen_yml_components/definitions.yml index ce3dea1e243..4f8c2ce8bb4 100644 --- a/etc/evergreen_yml_components/definitions.yml +++ b/etc/evergreen_yml_components/definitions.yml @@ -3672,7 +3672,7 @@ tasks: ## Standalone fuzzer for checking timeseries optimizations correctness ## - <<: *jstestfuzz_template name: aggregation_timeseries_fuzzer_gen - tags: ["aggfuzzer", "common", "timeseries", "require_npm", "random_name", "no_debug_mode"] + tags: ["aggfuzzer", "common", "timeseries", "require_npm", "random_name"] commands: - func: "generate resmoke tasks" vars: @@ -3761,7 +3761,7 @@ tasks: ## jstestfuzz standalone update time-series generational fuzzer ## - <<: *jstestfuzz_template name: update_timeseries_fuzzer_gen - tags: ["updatefuzzer", "require_npm", "random_name", "no_debug_mode"] + tags: ["updatefuzzer", "require_npm", "random_name"] commands: - func: "generate resmoke tasks" vars: @@ -3776,7 +3776,7 @@ tasks: ## jstestfuzz replication update generational fuzzer ## - <<: *jstestfuzz_template name: update_fuzzer_replication_gen - tags: ["updatefuzzer", "require_npm", "random_name", "multiversion", "no_debug_mode"] + tags: ["updatefuzzer", "require_npm", "random_name", "multiversion"] commands: - func: "generate resmoke tasks" vars: @@ -4426,7 +4426,7 @@ tasks: - <<: *task_template name: aggregation_read_concern_majority_passthrough - tags: ["aggregation", "read_write_concern", "no_debug_mode"] + tags: ["aggregation", "read_write_concern"] depends_on: - name: aggregation commands: @@ -4573,7 +4573,7 @@ tasks: - <<: *task_template name: change_streams_mongos_passthrough - tags: ["change_streams", "no_debug_mode"] + tags: ["change_streams"] depends_on: - name: change_streams commands: @@ -4642,7 +4642,7 @@ tasks: - <<: *task_template name: change_streams_whole_db_mongos_passthrough - tags: ["change_streams", "no_debug_mode"] + tags: ["change_streams"] depends_on: - name: change_streams_mongos_passthrough commands: @@ -4678,7 +4678,7 @@ tasks: - <<: *task_template name: change_streams_whole_cluster_mongos_passthrough - tags: ["change_streams", "no_debug_mode"] + tags: ["change_streams"] depends_on: - name: change_streams_mongos_passthrough commands: @@ -5288,7 +5288,7 @@ tasks: - <<: *gen_task_template name: noPassthrough_gen - tags: ["misc_js", "no_debug_mode"] + tags: ["misc_js"] commands: - func: "generate resmoke tasks" vars: @@ -5411,7 +5411,7 @@ tasks: - <<: *gen_task_template name: multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough_gen - tags: ["multi_shard", "no_debug_mode"] + tags: ["multi_shard"] commands: - func: "generate resmoke tasks" vars: @@ -5635,7 +5635,7 @@ tasks: - <<: *gen_task_template name: concurrency_replication_multi_stmt_txn_gen - tags: ["concurrency", "common", "repl", "txn", "no_debug_mode"] + tags: ["concurrency", "common", "repl", "txn"] commands: - func: "generate resmoke tasks" vars: @@ -5687,7 +5687,7 @@ tasks: - <<: *gen_task_template name: concurrency_sharded_replication_gen - tags: ["concurrency", "common", "read_concern_maj", "large", "sharded", "no_debug_mode"] + tags: ["concurrency", "common", "read_concern_maj", "large", "sharded"] commands: - func: "generate resmoke tasks" vars: @@ -5704,7 +5704,7 @@ tasks: - <<: *gen_task_template name: concurrency_sharded_replication_with_balancer_gen - tags: ["concurrency", "common", "read_concern_maj", "large", "sharded", "no_debug_mode"] + tags: ["concurrency", "common", "read_concern_maj", "large", "sharded"] commands: - func: "generate resmoke tasks" vars: @@ -5735,7 +5735,7 @@ tasks: - <<: *gen_task_template name: concurrency_sharded_clusterwide_ops_add_remove_shards_gen - tags: ["concurrency", "common", "read_concern_maj", "large", "sharded", "no_debug_mode"] + tags: ["concurrency", "common", "read_concern_maj", "large", "sharded"] commands: - func: "generate resmoke tasks" vars: @@ -5744,7 +5744,7 @@ tasks: - <<: *gen_task_template name: concurrency_sharded_causal_consistency_gen - tags: ["concurrency", "non_live_record", "sharded", "no_debug_mode"] + tags: ["concurrency", "non_live_record", "sharded"] commands: - func: "generate resmoke tasks" vars: @@ -5753,7 +5753,7 @@ tasks: - <<: *gen_task_template name: concurrency_sharded_causal_consistency_and_balancer_gen - tags: ["concurrency", "large", "non_live_record", "sharded", "no_debug_mode"] + tags: ["concurrency", "large", "non_live_record", "sharded"] commands: - func: "generate resmoke tasks" vars: @@ -5762,7 +5762,7 @@ tasks: - <<: *gen_task_template name: concurrency_sharded_with_stepdowns_gen - tags: ["concurrency", "stepdowns", "large", "sharded", "no_debug_mode"] + tags: ["concurrency", "stepdowns", "large", "sharded"] commands: - func: "generate resmoke tasks" vars: @@ -5771,7 +5771,7 @@ tasks: - <<: *gen_task_template name: concurrency_sharded_with_stepdowns_and_balancer_gen - tags: ["concurrency", "stepdowns", "large", "sharded", "no_debug_mode"] + tags: ["concurrency", "stepdowns", "large", "sharded"] commands: - func: "generate resmoke tasks" vars: @@ -5780,7 +5780,7 @@ tasks: - <<: *gen_task_template name: concurrency_sharded_terminate_primary_with_balancer_gen - tags: ["concurrency", "stepdowns", "kill_terminate", "sharded", "no_debug_mode"] + tags: ["concurrency", "stepdowns", "kill_terminate", "sharded"] commands: - func: "generate resmoke tasks" vars: @@ -5789,7 +5789,7 @@ tasks: - <<: *gen_task_template name: concurrency_sharded_kill_primary_with_balancer_gen - tags: ["concurrency", "stepdowns", "kill_terminate", "sharded", "no_debug_mode"] + tags: ["concurrency", "stepdowns", "kill_terminate", "sharded"] commands: - func: "generate resmoke tasks" vars: @@ -5798,7 +5798,7 @@ tasks: - <<: *gen_task_template name: concurrency_sharded_multi_stmt_txn_gen - tags: ["concurrency", "large", "sharded", "no_debug_mode"] + tags: ["concurrency", "large", "sharded"] commands: - func: "generate resmoke tasks" vars: @@ -5807,7 +5807,7 @@ tasks: - <<: *gen_task_template name: concurrency_sharded_multi_stmt_txn_with_balancer_gen - tags: ["concurrency", "large", "sharded", "no_debug_mode"] + tags: ["concurrency", "large", "sharded"] commands: - func: "generate resmoke tasks" vars: @@ -5816,7 +5816,7 @@ tasks: - <<: *gen_task_template name: concurrency_sharded_local_read_write_multi_stmt_txn_gen - tags: ["concurrency", "large", "sharded", "no_debug_mode"] + tags: ["concurrency", "large", "sharded"] commands: - func: "generate resmoke tasks" vars: @@ -5825,7 +5825,7 @@ tasks: - <<: *gen_task_template name: concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer_gen - tags: ["concurrency", "large", "sharded", "no_debug_mode"] + tags: ["concurrency", "large", "sharded"] commands: - func: "generate resmoke tasks" vars: @@ -5834,7 +5834,7 @@ tasks: - <<: *gen_task_template name: concurrency_sharded_multi_stmt_txn_with_stepdowns_gen - tags: ["concurrency", "stepdowns", "large", "sharded", "no_debug_mode"] + tags: ["concurrency", "stepdowns", "large", "sharded"] commands: - func: "generate resmoke tasks" vars: @@ -5843,7 +5843,7 @@ tasks: - <<: *gen_task_template name: concurrency_sharded_multi_stmt_txn_terminate_primary_gen - tags: ["concurrency", "stepdowns", "kill_terminate", "sharded", "no_debug_mode"] + tags: ["concurrency", "stepdowns", "kill_terminate", "sharded"] commands: - func: "generate resmoke tasks" vars: @@ -5852,7 +5852,7 @@ tasks: - <<: *gen_task_template name: concurrency_sharded_multi_stmt_txn_kill_primary_gen - tags: ["concurrency", "stepdowns", "kill_terminate", "sharded", "no_debug_mode"] + tags: ["concurrency", "stepdowns", "kill_terminate", "sharded"] commands: - func: "generate resmoke tasks" vars: @@ -5955,7 +5955,7 @@ tasks: - <<: *gen_task_template name: replica_sets_ese_gen - tags: ["replica_sets", "encrypt", "san", "no_debug_mode"] + tags: ["replica_sets", "encrypt", "san"] commands: - func: "generate resmoke tasks" vars: @@ -5963,7 +5963,7 @@ tasks: - <<: *gen_task_template name: replica_sets_ese_gcm_gen - tags: ["replica_sets", "encrypt", "san", "gcm", "no_debug_mode"] + tags: ["replica_sets", "encrypt", "san", "gcm"] commands: - func: "generate resmoke tasks" vars: @@ -5971,7 +5971,7 @@ tasks: - <<: *gen_task_template name: replica_sets_auth_gen - tags: ["replica_sets", "common", "san", "auth", "no_debug_mode"] + tags: ["replica_sets", "common", "san", "auth"] commands: - func: "generate resmoke tasks" vars: @@ -6047,7 +6047,7 @@ tasks: - <<: *gen_task_template name: sharding_ese_gen - tags: ["sharding", "encrypt", "no_debug_mode"] + tags: ["sharding", "encrypt"] commands: - func: "generate resmoke tasks" vars: @@ -6055,7 +6055,7 @@ tasks: - <<: *gen_task_template name: sharding_ese_gcm_gen - tags: ["sharding", "encrypt", "gcm", "no_debug_mode"] + tags: ["sharding", "encrypt", "gcm"] commands: - func: "generate resmoke tasks" vars: @@ -6063,7 +6063,7 @@ tasks: - <<: *gen_task_template name: sharding_auth_gen - tags: ["sharding", "auth", "no_debug_mode"] + tags: ["sharding", "auth"] commands: - func: "generate resmoke tasks" vars: @@ -6071,7 +6071,7 @@ tasks: - <<: *gen_task_template name: sharding_auth_audit_gen - tags: ["auth", "audit", "non_live_record", "no_debug_mode"] + tags: ["auth", "audit", "non_live_record"] commands: - func: "generate resmoke tasks" vars: @@ -6079,7 +6079,7 @@ tasks: - <<: *gen_task_template name: sharding_hello_failures_gen - tags: ["concurrency", "large", "sharded", "no_debug_mode"] + tags: ["concurrency", "large", "sharded"] commands: - func: "generate resmoke tasks" vars: @@ -6394,7 +6394,7 @@ tasks: - <<: *task_template name: ocsp - tags: ["ssl", "encrypt", "ocsp", "patch_build", "no_debug_mode"] + tags: ["ssl", "encrypt", "ocsp", "patch_build"] commands: - func: "do setup" - func: "run tests" diff --git a/jstests/aggregation/sources/setWindowFields/spill_to_disk.js b/jstests/aggregation/sources/setWindowFields/spill_to_disk.js index 041c6e195e9..40eeb984f45 100644 --- a/jstests/aggregation/sources/setWindowFields/spill_to_disk.js +++ b/jstests/aggregation/sources/setWindowFields/spill_to_disk.js @@ -29,7 +29,7 @@ let smallPartitionSize = 6; let largePartitionSize = 21; setParameterOnAllHosts(DiscoverTopology.findNonConfigNodes(db.getMongo()), "internalDocumentSourceSetWindowFieldsMaxMemoryBytes", - avgDocSize * smallPartitionSize + 73); + avgDocSize * smallPartitionSize + 50); seedWithTickerData(coll, 10); diff --git a/jstests/auth/validate_sasl_mechanism.js b/jstests/auth/validate_sasl_mechanism.js index 488fdb3afb4..a819c081ff2 100644 --- a/jstests/auth/validate_sasl_mechanism.js +++ b/jstests/auth/validate_sasl_mechanism.js @@ -12,7 +12,7 @@ function waitFailedToStart(pid, exitCode) { } return res.exitCode == exitCode; - }, `Failed to wait for ${pid} to die with exit code ${exitCode}`, 60 * 1000); + }, `Failed to wait for ${pid} to die with exit code ${exitCode}`, 30 * 1000); } const m = MongoRunner.runMongod({ diff --git a/jstests/noPassthrough/predictive_connpool.js b/jstests/noPassthrough/predictive_connpool.js index dbe517a5667..be307a6e318 100644 --- a/jstests/noPassthrough/predictive_connpool.js +++ b/jstests/noPassthrough/predictive_connpool.js @@ -105,7 +105,7 @@ function hasConnPoolStats(args) { return hosts.map(host => checkStats(res, host)).every(x => x); } - assert.soon(checkAllStats, "Check #" + checkNum + " failed", 10 * 1000); + assert.soon(checkAllStats, "Check #" + checkNum + " failed", 10000); jsTestLog("Check #" + checkNum + " successful"); } diff --git a/src/mongo/shell/assert.js b/src/mongo/shell/assert.js index 657f6742f49..7749172f0ad 100644 --- a/src/mongo/shell/assert.js +++ b/src/mongo/shell/assert.js @@ -344,6 +344,14 @@ assert = (function() { assert.soon = function(func, msg, timeout, interval, {runHangAnalyzer = true} = {}) { _validateAssertionMessage(msg); + var msgPrefix = "assert.soon failed: " + func; + + if (msg) { + if (typeof (msg) != "function") { + msgPrefix = "assert.soon failed, msg"; + } + } + var start = new Date(); if (TestData && TestData.inEvergreen) { @@ -354,14 +362,6 @@ assert = (function() { interval = interval || 200; - var msgPrefix = "assert.soon (timeout " + timeout + "ms) failed: " + func; - - if (msg) { - if (typeof (msg) != "function") { - msgPrefix = "assert.soon (timeout " + timeout + "ms) failed, msg"; - } - } - while (1) { if (typeof (func) == "string") { if (eval(func)) |