diff options
| -rw-r--r-- | etc/evergreen.yml | 32 | ||||
| -rw-r--r-- | etc/evergreen_nightly.yml | 8 | ||||
| -rw-r--r-- | etc/evergreen_timeouts.yml | 2 | ||||
| -rw-r--r-- | etc/evergreen_yml_components/variants/misc_release.yml | 2 | ||||
| -rw-r--r-- | etc/generate_subtasks_config.yml | 4 | ||||
| -rw-r--r-- | evergreen/resmoke_tests_execute.sh | 5 | ||||
| -rw-r--r-- | src/mongo/db/query/query_knobs.idl | 2 |
7 files changed, 27 insertions, 28 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index ebae8842eb2..120d17c883a 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -1549,14 +1549,14 @@ buildvariants: - name: vector_search_auth - name: vector_search_ssl -- &enterprise-rhel-8-64-bit-dynamic-classic-engine - name: enterprise-rhel-8-64-bit-dynamic-classic-engine - display_name: "Shared Library Enterprise RHEL 8 (Classic Engine)" +- &enterprise-rhel-8-64-bit-dynamic-sbe + name: enterprise-rhel-8-64-bit-dynamic-sbe + display_name: "Shared Library Enterprise RHEL 8 (SBE)" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. stepback: false run_on: - rhel80-small - expansions: &enterprise-rhel-8-64-bit-dynamic-classic-engine-expansions + expansions: &enterprise-rhel-8-64-bit-dynamic-sbe-expansions additional_package_targets: archive-mongocryptd archive-mongocryptd-debug archive-mh archive-mh-debug compile_flags: --ssl MONGO_DISTMOD=rhel80 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --link-model=dynamic --use-diagnostic-latches=on multiversion_platform: rhel80 @@ -1571,7 +1571,7 @@ buildvariants: large_distro_name: rhel80-medium num_scons_link_jobs_available: 0.99 test_flags: >- - --mongodSetParameters="{internalQueryForceClassicEngine: true}" + --mongodSetParameters="{internalQueryForceClassicEngine: false}" tasks: - name: .aggfuzzer - name: .aggregation @@ -2297,8 +2297,8 @@ buildvariants: # - name: server_discovery_and_monitoring_json_test_TG # - name: server_selection_json_test_TG -- name: rhel8-debug-asan-classic-engine - display_name: ~ ASAN Enterprise RHEL 8 DEBUG (Classic Engine) +- name: rhel8-debug-asan-sbe + display_name: ~ ASAN Enterprise RHEL 8 DEBUG (SBE) cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel80-build @@ -2311,7 +2311,7 @@ buildvariants: san_options: LSAN_OPTIONS="suppressions=etc/lsan.suppressions:report_objects=1:external_symbolizer_path=/opt/mongodbtoolchain/v3/bin/llvm-symbolizer" ASAN_OPTIONS="detect_leaks=1:check_initialization_order=true:strict_init_order=true:abort_on_error=1:disable_coredump=0:handle_abort=1:external_symbolizer_path=/opt/mongodbtoolchain/v3/bin/llvm-symbolizer" compile_flags: --variables-files=etc/scons/mongodbtoolchain_v3_clang.vars --dbg=on --opt=on --allocator=system --sanitize=address --ssl --ocsp-stapling=off -j$(grep -c ^processor /proc/cpuinfo) --modules= --use-diagnostic-latches=on test_flags: >- - --mongodSetParameters="{internalQueryForceClassicEngine: true}" + --mongodSetParameters="{internalQueryForceClassicEngine: false}" --excludeWithAnyTags=requires_fast_memory,requires_ocsp_stapling --enableEnterpriseTests=off multiversion_platform: rhel80 @@ -2439,8 +2439,8 @@ buildvariants: # - name: server_discovery_and_monitoring_json_test_TG # - name: server_selection_json_test_TG -- name: rhel8-debug-ubsan-classic-engine - display_name: "~ UBSAN Enterprise RHEL 8 DEBUG (Classic Engine)" +- name: rhel8-debug-ubsan-sbe + display_name: "~ UBSAN Enterprise RHEL 8 DEBUG (SBE)" cron: "0 4 * * *" # From the ${project_nightly_cron} parameter. run_on: - rhel80-build @@ -2453,7 +2453,7 @@ buildvariants: san_options: UBSAN_OPTIONS="print_stacktrace=1:external_symbolizer_path=/opt/mongodbtoolchain/v3/bin/llvm-symbolizer" compile_flags: --variables-files=etc/scons/mongodbtoolchain_v3_clang.vars --dbg=on --opt=on --sanitize=undefined --ssl --ocsp-stapling=off -j$(grep -c ^processor /proc/cpuinfo) --modules= --use-diagnostic-latches=on test_flags: >- - --mongodSetParameters="{internalQueryForceClassicEngine: true}" + --mongodSetParameters="{internalQueryForceClassicEngine: false}" --excludeWithAnyTags=requires_ocsp_stapling,requires_increased_memlock_limits --enableEnterpriseTests=off multiversion_platform: rhel80 @@ -2927,18 +2927,18 @@ buildvariants: - windows-vsCurrent-large ### QO & QE Patch-Specific Build Variants ### -- <<: *enterprise-rhel-8-64-bit-dynamic-classic-engine - name: enterprise-rhel-8-64-bit-dynamic-classic-engine-query-patch-only - display_name: "~ Shared Library Enterprise RHEL 8 Query Patch Only (Classic Engine)" +- <<: *enterprise-rhel-8-64-bit-dynamic-sbe + name: enterprise-rhel-8-64-bit-dynamic-sbe-query-patch-only + display_name: "~ Shared Library Enterprise RHEL 8 Query Patch Only (SBE)" cron: "0 4 * * 0" # From the ${project_weekly_cron} parameter # This is a patch-only variant but we run on mainline to pick up task history. expansions: - <<: *enterprise-rhel-8-64-bit-dynamic-classic-engine-expansions + <<: *enterprise-rhel-8-64-bit-dynamic-sbe-expansions jstestfuzz_num_generated_files: 20 jstestfuzz_concurrent_num_files: 5 target_resmoke_time: 30 max_sub_suites: 3 test_flags: >- - --mongodSetParameters="{internalQueryForceClassicEngine: true}" + --mongodSetParameters="{internalQueryForceClassicEngine: false}" --excludeWithAnyTags=resource_intensive - <<: *enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required-template diff --git a/etc/evergreen_nightly.yml b/etc/evergreen_nightly.yml index fd3d3660d77..7688719bd4c 100644 --- a/etc/evergreen_nightly.yml +++ b/etc/evergreen_nightly.yml @@ -480,9 +480,9 @@ buildvariants: - rhel80-medium - name: generate_buildid_to_debug_symbols_mapping -- &enterprise-rhel-8-64-bit-dynamic-classic-engine - name: enterprise-rhel-8-64-bit-dynamic-classic-engine - display_name: "Shared Library Enterprise RHEL 8 (Classic Engine)" +- &enterprise-rhel-8-64-bit-dynamic-sbe + name: enterprise-rhel-8-64-bit-dynamic-sbe + display_name: "Shared Library Enterprise RHEL 8 (SBE)" cron: "0 4 * * 0" run_on: - rhel80-small @@ -501,7 +501,7 @@ buildvariants: large_distro_name: rhel80-medium num_scons_link_jobs_available: 0.99 test_flags: >- - --mongodSetParameters="{internalQueryForceClassicEngine: true}" + --mongodSetParameters="{internalQueryForceClassicEngine: false}" --excludeWithAnyTags=requires_latch_analyzer tasks: - name: .aggfuzzer diff --git a/etc/evergreen_timeouts.yml b/etc/evergreen_timeouts.yml index b543b560346..6f979850021 100644 --- a/etc/evergreen_timeouts.yml +++ b/etc/evergreen_timeouts.yml @@ -55,7 +55,7 @@ overrides: - task: update_timeseries_fuzzer exec_timeout: 150 # 2.5 hours - rhel8-debug-ubsan-classic-engine: + rhel8-debug-ubsan-sbe-engine: - task: update_timeseries_fuzzer exec_timeout: 150 # 2.5 hours diff --git a/etc/evergreen_yml_components/variants/misc_release.yml b/etc/evergreen_yml_components/variants/misc_release.yml index 3e6045335b2..ce385594026 100644 --- a/etc/evergreen_yml_components/variants/misc_release.yml +++ b/etc/evergreen_yml_components/variants/misc_release.yml @@ -2352,7 +2352,7 @@ buildvariants: --use-diagnostic-latches=off crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" test_flags: >- - --mongodSetParameters="{featureFlagSbeFull: true}" + --mongodSetParameters="{featureFlagSbeFull: true, internalQueryForceClassicEngine: false}" --excludeWithAnyTags=resource_intensive,incompatible_with_amazon_linux,sbe_incompatible,requires_latch_analyzer has_packages: true multiversion_platform: amazon2 diff --git a/etc/generate_subtasks_config.yml b/etc/generate_subtasks_config.yml index c4618482283..7e8384e5e6e 100644 --- a/etc/generate_subtasks_config.yml +++ b/etc/generate_subtasks_config.yml @@ -58,8 +58,8 @@ build_variant_large_distro_exceptions: - ubuntu1604-debug - ubuntu1804-debug-asan - ubuntu1804-debug-asan-all-feature-flags - - ubuntu1804-debug-asan-classic-engine + - ubuntu1804-debug-asan-sbe-engine - ubuntu1804-debug-aubsan-lite-required - ubuntu1804-debug-ubsan - ubuntu1804-debug-ubsan-all-feature-flags - - ubuntu1804-debug-ubsan-classic-engine + - ubuntu1804-debug-ubsan-sbe-engine diff --git a/evergreen/resmoke_tests_execute.sh b/evergreen/resmoke_tests_execute.sh index 680f4724951..911a85414fd 100644 --- a/evergreen/resmoke_tests_execute.sh +++ b/evergreen/resmoke_tests_execute.sh @@ -24,9 +24,8 @@ if [[ ${disable_unit_tests} = "false" && ! -f ${skip_tests} ]]; then tags_build_variant="${build_variant}" if [[ "${build_variant}" =~ .*"-query-patch-only" ]]; then - # Use the RHEL 8 all feature flags variant for the classic engine variant. The original - # classic engine variant is not a required builder and therefore not captured in patch - # test failure history. + # Use the RHEL 8 all feature flags variant for the SBE variant. The original SBE variant is + # not a required builder and therefore not captured in patch test failure history. tags_build_variant="enterprise-rhel-8-64-bit-dynamic-all-feature-flags-required" fi diff --git a/src/mongo/db/query/query_knobs.idl b/src/mongo/db/query/query_knobs.idl index 331778c0a01..f0f24d3c3dd 100644 --- a/src/mongo/db/query/query_knobs.idl +++ b/src/mongo/db/query/query_knobs.idl @@ -676,7 +676,7 @@ server_parameters: set_at: [ startup, runtime ] cpp_varname: "internalQueryForceClassicEngine" cpp_vartype: AtomicWord<bool> - default: false + default: true internalQueryAppendIdToSetWindowFieldsSort: description: "If true, appends _id to the sort stage generated by desugaring $setWindowFields to |