mongodb/mongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SERVER-122534: [8.3] Fix generate-fuzz-config crash when config.MODULES is … (#50684)

Browse Source 
GitOrigin-RevId: d46e704295262048a633ef064a547a17d04db4d8
This commit is contained in:
Nick Jefferies 2026-04-03 13:00:39 -04:00 committed by MongoDB Bot
parent 6f4b54716a
commit 442ae3df3b
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildscripts/resmokelib/config.py
View File

@ -398,7 +398,7 @@ CONFIG_SHARD = None
MODULES_CONFIG_PATH = None
# list of enabled modules
MODULES = None
MODULES = []
# list of dirs from enabled modules to get suites from
MODULE_SUITE_DIRS = []

22
buildscripts/resmokelib/generate_fuzz_config/mongo_fuzzer_configs.py
View File

@ -7,6 +7,18 @@ import stat
from buildscripts.resmokelib import config, utils
def is_enterprise_param_available(param_config: dict) -> bool:
"""
Check if a parameter is available for fuzzing.
Returns True if the parameter is available (either not enterprise-only, or the
enterprise module is loaded). This handles the case where config.MODULES is empty
(e.g., when generate-fuzz-config is run standalone without module initialization).
"""
return not param_config.get("enterprise_only", False) or "enterprise" in (config.MODULES or [])
# Parameter sets with different behaviors.
flow_control_params = [
"flowControlTicketAdderConstant",
@ -218,7 +230,7 @@ def generate_encryption_config(rng: random.Random):
# encryption also required an enterprise binary.
if (
config.STORAGE_ENGINE != "wiredTiger"
or "enterprise" not in config.MODULES
or "enterprise" not in (config.MODULES or [])
or config.DISABLE_ENCRYPTION_FUZZING
):
return ret
@ -375,8 +387,7 @@ def generate_mongod_parameters(rng):
params = {
param: val
for param, val in config_fuzzer_params["mongod"].items()
if "startup" in val.get("fuzz_at", [])
and not (val.get("enterprise_only", False) and "enterprise" not in config.MODULES)
if "startup" in val.get("fuzz_at", []) and is_enterprise_param_available(val)
}
# TODO (SERVER-75632): Remove/comment out the below line to enable passthrough testing.
@ -412,7 +423,7 @@ def generate_mongod_extra_configs(rng):
generated_config = {
key: generate_normal_mongo_parameters(rng, value, key)
for key, value in config_fuzzer_extra_configs["mongod"].items()
if not (value.get("enterprise_only", False) and "enterprise" not in config.MODULES)
if is_enterprise_param_available(value)
}
# This is needed for our antithesis setup
@ -434,8 +445,7 @@ def generate_mongos_parameters(rng):
params = {
param: val
for param, val in config_fuzzer_params["mongos"].items()
if "startup" in val.get("fuzz_at", [])
and not (val.get("enterprise_only", False) and "enterprise" not in config.MODULES)
if "startup" in val.get("fuzz_at", []) and is_enterprise_param_available(val)
}
return {key: generate_normal_mongo_parameters(rng, value, key) for key, value in params.items()}

9
buildscripts/resmokelib/testing/hooks/fuzz_runtime_parameters.py
View File

@ -13,6 +13,7 @@ from buildscripts.resmokelib import config, errors
from buildscripts.resmokelib.generate_fuzz_config.mongo_fuzzer_configs import (
generate_normal_mongo_parameters,
generate_special_runtime_parameters,
is_enterprise_param_available,
)
from buildscripts.resmokelib.testing.fixtures import interface as fixture_interface
from buildscripts.resmokelib.testing.fixtures import replicaset, shardedcluster, standalone
@ -123,21 +124,19 @@ class FuzzRuntimeParameters(interface.Hook):
runtime_mongod_params = {
param: val
for param, val in config_fuzzer_params["mongod"].items()
if "runtime" in val.get("fuzz_at", [])
and not (val.get("enterprise_only", False) and "enterprise" not in config.MODULES)
if "runtime" in val.get("fuzz_at", []) and is_enterprise_param_available(val)
}
runtime_mongos_params = {
param: val
for param, val in config_fuzzer_params["mongos"].items()
if "runtime" in val.get("fuzz_at", [])
and not (val.get("enterprise_only", False) and "enterprise" not in config.MODULES)
if "runtime" in val.get("fuzz_at", []) and is_enterprise_param_available(val)
}
# Get cluster parameters
cluster_params = {
param: val
for param, val in config_fuzzer_params["cluster"].items()
if not (val.get("enterprise_only", False) and "enterprise" not in config.MODULES)
if is_enterprise_param_available(val)
}
# Flow control-related parameters should only be fuzzed when enableFlowControl is set to True at startup.