Skip to content

CXX-3321 Enable CSFLE for sanitizer tasks #1434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 30, 2025
Merged

CXX-3321 Enable CSFLE for sanitizer tasks #1434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3819a51
Enable CSFLE for sanitizer tasks
eramongodb Jul 30, 2025
89e5d94
Reduce sanitizers matrix to static library linkage
eramongodb Jul 30, 2025
acce070
Print name of test executable being executed
eramongodb Jul 30, 2025
9d28093
Pin mongoc_version_minimum to 912209d (CDRIVER-5960)
eramongodb Jul 30, 2025
ddf276f
Bump minimum server version from 4.0 to 4.2 (CDRIVER-5956)
eramongodb Jul 30, 2025
e9b2a32
Update MONGOC_VERSION_MINIMUM to better document current practices
eramongodb Jul 30, 2025
2e10f22
CXX-3259 drop support for MongoDB Server 4.2
eramongodb Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .evergreen/config_generator/components/funcs/install_c_driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,13 @@
from typing import Mapping


# If updating mongoc_version_minimum, also update:
# If updating mongoc_version_minimum to a new release (not pinning to an unreleased commit), also update:
# - BSON_REQUIRED_VERSION and MONGOC_REQUIRED_VERSION in CMakeLists.txt
# - the version of pkg:github/mongodb/mongo-c-driver in etc/purls.txt
# - the default value of --c-driver-build-ref in etc/make_release.py
# Only MONGOC_DOWNLOAD_VERSION needs to be updated when pinning to an unreleased commit.
# If pinning to an unreleased commit, create a "Blocked" JIRA ticket with
# a "depends on" link to the appropriate C Driver version release ticket.
MONGOC_VERSION_MINIMUM = '2.0.2'
MONGOC_VERSION_MINIMUM = '912209d5dc985758bc3d70b105dc5166e3ded7c3' # TODO: bump to 2.1.0 once released.


class InstallCDriver(Function):
Expand Down
1 change: 1 addition & 0 deletions .evergreen/config_generator/components/funcs/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ class Test(Function):
'MONGODB_API_VERSION',
'platform',
'TEST_WITH_ASAN',
'TEST_WITH_CSFLE',
'TEST_WITH_UBSAN',
'TEST_WITH_VALGRIND',
'use_mongocryptd',
Expand Down
3 changes: 1 addition & 2 deletions .evergreen/config_generator/components/integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@
LINUX_MATRIX = [
# Linux x86_64 (full).
# RHEL 8 x86_64: 4.0+.
('rhel80', None, ['Debug'], ['shared', 'static'], [11, 17], [None], ['plain', 'csfle'], [ '4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest'], ['single', 'replica', 'sharded']),
('rhel80', None, ['Debug'], ['shared', 'static'], [11, 17], [None], ['plain', ], ['4.0', ], ['single', 'replica', 'sharded']), # CSFLE: 4.2+.
('rhel80', None, ['Debug'], ['shared', 'static'], [11, 17], [None], ['plain', 'csfle'], ['4.2', '4.4', '5.0', '6.0', '7.0', '8.0', 'latest'], ['single', 'replica', 'sharded']),

Copy link
Collaborator

@kevinAlbs kevinAlbs Jul 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggest also adding to CHANGELOG.md (though could also be done during next release):

### Removed
- Support for MongoDB Server 4.0 (due to the minimum required C Driver version).

# Linux ARM64 (full).
# Linux ARM64: 4.4+.
Expand Down
8 changes: 4 additions & 4 deletions .evergreen/config_generator/components/sanitizers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# pylint: disable=line-too-long
# fmt: off
MATRIX = [
('rhel80', ['asan', 'ubsan'], ['shared', 'static'], ['4.0', '8.0', 'latest'], ['single', 'replica', 'sharded']),
('rhel80', ['asan', 'ubsan'], ['static'], ['4.2', '8.0', 'latest'], ['single', 'replica', 'sharded']),
]
# fmt: on
# pylint: enable=line-too-long
Expand Down Expand Up @@ -57,9 +57,9 @@ def tasks():
updates += [KeyValueParam(key=key, value=value)
for key, value in [('cc_compiler', cc_compiler), ('cxx_compiler', cxx_compiler)]]

icd_vars = {'SKIP_INSTALL_LIBMONGOCRYPT': 1}
compile_vars = {'ENABLE_TESTS': 'ON', 'RUN_DISTCHECK': 1}
compile_vars = {'ENABLE_TESTS': 'ON'}
test_vars = {
'TEST_WITH_CSFLE': 'ON',
'MONGOCXX_TEST_TOPOLOGY': topology,
'example_projects_cc': 'clang',
'example_projects_cxx': 'clang++',
Expand Down Expand Up @@ -96,7 +96,7 @@ def tasks():
commands += [
Setup.call(),
StartMongod.call(mongodb_version=mongodb_version, topology=topology),
InstallCDriver.call(vars=icd_vars),
InstallCDriver.call(),
InstallUV.call(),
Compile.call(vars=compile_vars),
FetchDET.call(),
Expand Down
2 changes: 1 addition & 1 deletion .evergreen/config_generator/components/valgrind.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# fmt: off
MATRIX = [
# min-max-latest
('rhel80', None, ['shared'], ['4.0', '8.0', 'latest'], ['single', 'replica', 'sharded']),
('rhel80', None, ['shared'], ['4.2', '8.0', 'latest'], ['single', 'replica', 'sharded']),
]
# fmt: on
# pylint: enable=line-too-long
Expand Down
3 changes: 2 additions & 1 deletion .evergreen/generated_configs/functions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ functions:
type: setup
params:
updates:
- { key: mongoc_version_minimum, value: 2.0.2 }
- { key: mongoc_version_minimum, value: 912209d5dc985758bc3d70b105dc5166e3ded7c3 }
- command: subprocess.exec
type: setup
params:
Expand Down Expand Up @@ -692,6 +692,7 @@ functions:
- MONGODB_API_VERSION
- platform
- TEST_WITH_ASAN
- TEST_WITH_CSFLE
- TEST_WITH_UBSAN
- TEST_WITH_VALGRIND
- use_mongocryptd
Expand Down
Loading