diff options
49 files changed, 112 insertions, 112 deletions
diff --git a/buildscripts/burn_in_tests.py b/buildscripts/burn_in_tests.py index 376682ef465..b44284e8022 100755 --- a/buildscripts/burn_in_tests.py +++ b/buildscripts/burn_in_tests.py @@ -155,7 +155,7 @@ def find_excludes(selector_file: str) -> Tuple[List, List, List]: def filter_tests(tests: Set[str], exclude_tests: List[str]) -> Set[str]: """ - Exclude tests which have been blacklisted. + Exclude tests which have been denylisted. :param tests: Set of tests to filter. :param exclude_tests: Tests to filter out. diff --git a/buildscripts/evergreen_gen_multiversion_tests.py b/buildscripts/evergreen_gen_multiversion_tests.py index f3d5289bbe7..dfcc36ed8d8 100755 --- a/buildscripts/evergreen_gen_multiversion_tests.py +++ b/buildscripts/evergreen_gen_multiversion_tests.py @@ -385,7 +385,7 @@ def generate_exclude_yaml(task_path_suffix: str, output: str) -> None: Create a tag file associating multiversion tests to tags for exclusion. Compares the BACKPORTS_REQUIRED_FILE on the current branch with the same file on the - last-lts branch to determine which tests should be blacklisted. + last-lts branch to determine which tests should be denylisted. """ enable_logging() diff --git a/buildscripts/pylinters.py b/buildscripts/pylinters.py index aab4378d80e..a7cf624a6e7 100755 --- a/buildscripts/pylinters.py +++ b/buildscripts/pylinters.py @@ -58,9 +58,9 @@ def get_py_linter(linter_filter): def is_interesting_file(file_name): # type: (str) -> bool """Return true if this file should be checked.""" - file_blacklist = [] # type: List[str] - directory_blacklist = ["src/third_party"] - if file_name in file_blacklist or file_name.startswith(tuple(directory_blacklist)): + file_denylist = [] # type: List[str] + directory_denylist = ["src/third_party"] + if file_name in file_denylist or file_name.startswith(tuple(directory_denylist)): return False directory_list = ["buildscripts", "pytests"] return file_name.endswith(".py") and file_name.startswith(tuple(directory_list)) diff --git a/buildscripts/resmokeconfig/suites/causally_consistent_hedged_reads_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/causally_consistent_hedged_reads_jscore_passthrough.yml index 571eaea8e20..f09faea9ac0 100644 --- a/buildscripts/resmokeconfig/suites/causally_consistent_hedged_reads_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/causally_consistent_hedged_reads_jscore_passthrough.yml @@ -32,7 +32,7 @@ selector: - jstests/core/geo_s2sparse.js # keysPerIndex in different spot in validate(). - jstests/core/killop_drop_collection.js # Uses fsyncLock. - jstests/core/or_to_in.js # queryPlanner in different spot in explain() - # Tests that need triaging & remediation | blacklist decision + # Tests that need triaging & remediation | denylist decision # Comments list possible problem point under review. - jstests/core/stages_delete.js # Uses stageDebug command for deletes. # Tests that fail for Causal Consistency as they have statements that do not support diff --git a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml index 54737168d75..5ea76b5390c 100644 --- a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml @@ -32,7 +32,7 @@ selector: - jstests/core/geo_s2sparse.js # keysPerIndex in different spot in validate(). - jstests/core/killop_drop_collection.js # Uses fsyncLock. - jstests/core/or_to_in.js # queryPlanner in different spot in explain() - # Tests that need triaging & remediation | blacklist decision + # Tests that need triaging & remediation | denylist decision # Comments list possible problem point under review. - jstests/core/stages_delete.js # Uses stageDebug command for deletes. # Tests that fail for Causal Consistency as they have statements that do not support diff --git a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml index 6ab27e81519..8511fbff220 100644 --- a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml +++ b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml @@ -42,7 +42,7 @@ selector: - jstests/core/geo_s2sparse.js # keysPerIndex in different spot in validate(). - jstests/core/killop_drop_collection.js # Uses fsyncLock. - jstests/core/or_to_in.js # queryPlanner in different spot in explain() - # Tests that need triaging & remediation | blacklist decision + # Tests that need triaging & remediation | denylist decision # Comments list possible problem point under review. - jstests/core/stages_delete.js # Uses stageDebug command for deletes. # Tests that fail for Causal Consistency as they have statements that do not support diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn.yml index 5a3aac40d27..6580101caa7 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn.yml @@ -5,7 +5,7 @@ selector: - jstests/concurrency/fsm_workloads/**/*.js exclude_files: ## - # Blacklists from concurrency_sharded_replication + # Denylists from concurrency_sharded_replication ## # SERVER-13116 distinct isn't sharding aware @@ -92,7 +92,7 @@ selector: - jstests/concurrency/fsm_workloads/yield_and_hashed.js - jstests/concurrency/fsm_workloads/yield_and_sorted.js - # TODO Unblacklist (SERVER-38852). + # TODO Undenylist (SERVER-38852). - jstests/concurrency/fsm_workloads/agg_out_interrupt_cleanup.js # serverStatus does not include transaction metrics on mongos. @@ -103,7 +103,7 @@ selector: - jstests/concurrency/fsm_workloads/multi_statement_transaction_all_commands_same_session.js ## - # Blacklists from concurrency_replication_multi_stmt_txn + # Denylists from concurrency_replication_multi_stmt_txn ## # Relies on having one thread observe writes from the other threads, which won't become visible @@ -120,7 +120,7 @@ selector: - jstests/concurrency/fsm_workloads/view_catalog_direct_system_writes.js ## - # Blacklists from concurrency_sharded_multi_stmt_txn + # Denylists from concurrency_sharded_multi_stmt_txn ## # Use updates that do not contain the shard key, so they are rejected before any commands are diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer.yml index 87d4ad67b37..f28f4236fbf 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer.yml @@ -5,7 +5,7 @@ selector: - jstests/concurrency/fsm_workloads/**/*.js exclude_files: ## - # Blacklists from concurrency_sharded_replication + # Denylists from concurrency_sharded_replication ## # SERVER-13116 distinct isn't sharding aware @@ -92,7 +92,7 @@ selector: - jstests/concurrency/fsm_workloads/yield_and_hashed.js - jstests/concurrency/fsm_workloads/yield_and_sorted.js - # TODO Unblacklist (SERVER-38852). + # TODO Undenylist (SERVER-38852). - jstests/concurrency/fsm_workloads/agg_out_interrupt_cleanup.js # serverStatus does not include transaction metrics on mongos. @@ -107,7 +107,7 @@ selector: - jstests/concurrency/fsm_workloads/drop_index_during_replan.js ## - # Blacklists from concurrency_replication_multi_stmt_txn + # Denylists from concurrency_replication_multi_stmt_txn ## # Relies on having one thread observe writes from the other threads, which won't become visible @@ -120,7 +120,7 @@ selector: - jstests/concurrency/fsm_workloads/view_catalog_direct_system_writes.js ## - # Blacklists from concurrency_sharded_multi_stmt_txn + # Denylists from concurrency_sharded_multi_stmt_txn ## # Use updates that do not contain the shard key, so they are rejected before any commands are diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml index 8ef1b8ac9a0..6466f07f570 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml @@ -5,7 +5,7 @@ selector: - jstests/concurrency/fsm_workloads/**/*.js exclude_files: ## - # Blacklists from concurrency_sharded_replication + # Denylists from concurrency_sharded_replication ## # SERVER-13116 distinct isn't sharding aware @@ -92,7 +92,7 @@ selector: - jstests/concurrency/fsm_workloads/yield_and_hashed.js - jstests/concurrency/fsm_workloads/yield_and_sorted.js - # TODO Unblacklist (SERVER-38852). + # TODO Undenylist (SERVER-38852). - jstests/concurrency/fsm_workloads/agg_out_interrupt_cleanup.js # serverStatus does not include transaction metrics on mongos. @@ -103,7 +103,7 @@ selector: - jstests/concurrency/fsm_workloads/multi_statement_transaction_all_commands_same_session.js ## - # Blacklists from concurrency_replication_multi_stmt_txn + # Denylists from concurrency_replication_multi_stmt_txn ## # Relies on having one thread observe writes from the other threads, which won't become visible @@ -120,7 +120,7 @@ selector: - jstests/concurrency/fsm_workloads/view_catalog_direct_system_writes.js ## - # Blacklists specific to this suite. + # Denylists specific to this suite. ## # Use updates that do not contain the shard key, so they are rejected before any commands are diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_kill_primary.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_kill_primary.yml index 13126caf23a..9d7b6c79b72 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_kill_primary.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_kill_primary.yml @@ -10,7 +10,7 @@ selector: - jstests/concurrency/fsm_workloads/**/*.js exclude_files: ## - # Blacklists from concurrency_sharded_replication + # Denylists from concurrency_sharded_replication ## # SERVER-13116 distinct isn't sharding aware @@ -108,7 +108,7 @@ selector: - jstests/concurrency/fsm_workloads/yield_and_hashed.js - jstests/concurrency/fsm_workloads/yield_and_sorted.js - # TODO Unblacklist (SERVER-38852). + # TODO Undenylist (SERVER-38852). - jstests/concurrency/fsm_workloads/agg_out_interrupt_cleanup.js # serverStatus does not include transaction metrics on mongos. @@ -119,7 +119,7 @@ selector: - jstests/concurrency/fsm_workloads/multi_statement_transaction_all_commands_same_session.js ## - # Blacklists from concurrency_replication_multi_stmt_txn + # Denylists from concurrency_replication_multi_stmt_txn ## # Relies on having one thread observe writes from the other threads, which won't become visible @@ -136,7 +136,7 @@ selector: - jstests/concurrency/fsm_workloads/view_catalog_direct_system_writes.js ## - # Blacklists from concurrency_sharded_multi_stmt_txn + # Denylists from concurrency_sharded_multi_stmt_txn ## # Use updates that do not contain the shard key, so they are rejected before any commands are @@ -149,7 +149,7 @@ selector: - jstests/concurrency/fsm_workloads/schema_validator_with_expr_variables.js ## - # Blacklists from concurrency_sharded_with_stepdowns + # Denylists from concurrency_sharded_with_stepdowns ## # ChunkHelper directly talks to the config servers and doesn't support retries for network errors @@ -175,7 +175,7 @@ selector: - jstests/concurrency/fsm_workloads/view_catalog_direct_system_writes.js ## - # Blacklists specific to this suite + # Denylists specific to this suite ## # Uses getMore. If a kill node happens between the time of creation of cursor (usually by calling @@ -227,7 +227,7 @@ selector: - does_not_support_transactions - does_not_support_stepdowns - # Note that "requires_non_retryable_writes" does not need to be blacklisted because some writes + # Note that "requires_non_retryable_writes" does not need to be denylisted because some writes # that are not individually retryable can be retried if they are part of a transaction. executor: diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_terminate_primary.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_terminate_primary.yml index 6efcc004a67..ac2859b471d 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_terminate_primary.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_terminate_primary.yml @@ -10,7 +10,7 @@ selector: - jstests/concurrency/fsm_workloads/**/*.js exclude_files: ## - # Blacklists from concurrency_sharded_replication + # Denylists from concurrency_sharded_replication ## # SERVER-13116 distinct isn't sharding aware @@ -108,7 +108,7 @@ selector: - jstests/concurrency/fsm_workloads/yield_and_hashed.js - jstests/concurrency/fsm_workloads/yield_and_sorted.js - # TODO Unblacklist (SERVER-38852). + # TODO Undenylist (SERVER-38852). - jstests/concurrency/fsm_workloads/agg_out_interrupt_cleanup.js # serverStatus does not include transaction metrics on mongos. @@ -119,7 +119,7 @@ selector: - jstests/concurrency/fsm_workloads/multi_statement_transaction_all_commands_same_session.js ## - # Blacklists from concurrency_replication_multi_stmt_txn + # Denylists from concurrency_replication_multi_stmt_txn ## # Relies on having one thread observe writes from the other threads, which won't become visible @@ -136,7 +136,7 @@ selector: - jstests/concurrency/fsm_workloads/view_catalog_direct_system_writes.js ## - # Blacklists from concurrency_sharded_multi_stmt_txn + # Denylists from concurrency_sharded_multi_stmt_txn ## # Use updates that do not contain the shard key, so they are rejected before any commands are @@ -149,7 +149,7 @@ selector: - jstests/concurrency/fsm_workloads/schema_validator_with_expr_variables.js ## - # Blacklists from concurrency_sharded_with_stepdowns + # Denylists from concurrency_sharded_with_stepdowns ## # ChunkHelper directly talks to the config servers and doesn't support retries for network errors @@ -175,7 +175,7 @@ selector: - jstests/concurrency/fsm_workloads/view_catalog_direct_system_writes.js ## - # Blacklists specific to this suite + # Denylists specific to this suite ## # Uses getMore. If a terminate happens between the time of creation of cursor (usually by calling @@ -227,7 +227,7 @@ selector: - does_not_support_transactions - does_not_support_stepdowns - # Note that "requires_non_retryable_writes" does not need to be blacklisted because some writes + # Note that "requires_non_retryable_writes" does not need to be denylisted because some writes # that are not individually retryable can be retried if they are part of a transaction. executor: diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml index fb435998e45..23a8f488022 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml @@ -5,7 +5,7 @@ selector: - jstests/concurrency/fsm_workloads/**/*.js exclude_files: ## - # Blacklists from concurrency_sharded_replication + # Denylists from concurrency_sharded_replication ## # SERVER-13116 distinct isn't sharding aware @@ -92,7 +92,7 @@ selector: - jstests/concurrency/fsm_workloads/yield_and_hashed.js - jstests/concurrency/fsm_workloads/yield_and_sorted.js - # TODO Unblacklist (SERVER-38852). + # TODO Undenylist (SERVER-38852). - jstests/concurrency/fsm_workloads/agg_out_interrupt_cleanup.js # serverStatus does not include transaction metrics on mongos. @@ -107,7 +107,7 @@ selector: - jstests/concurrency/fsm_workloads/drop_index_during_replan.js ## - # Blacklists from concurrency_replication_multi_stmt_txn + # Denylists from concurrency_replication_multi_stmt_txn ## # Relies on having one thread observe writes from the other threads, which won't become visible @@ -120,7 +120,7 @@ selector: - jstests/concurrency/fsm_workloads/view_catalog_direct_system_writes.js ## - # Blacklists specific to this suite. + # Denylists specific to this suite. ## # Use updates that do not contain the shard key, so they are rejected before any commands are diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml index f64bdcaa343..6b376d78f80 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml @@ -10,7 +10,7 @@ selector: - jstests/concurrency/fsm_workloads/**/*.js exclude_files: ## - # Blacklists from concurrency_sharded_replication + # Denylists from concurrency_sharded_replication ## # SERVER-13116 distinct isn't sharding aware @@ -94,7 +94,7 @@ selector: - jstests/concurrency/fsm_workloads/yield_and_hashed.js - jstests/concurrency/fsm_workloads/yield_and_sorted.js - # TODO Unblacklist (SERVER-38852). + # TODO Undenylist (SERVER-38852). - jstests/concurrency/fsm_workloads/agg_out_interrupt_cleanup.js # serverStatus does not include transaction metrics on mongos. @@ -105,7 +105,7 @@ selector: - jstests/concurrency/fsm_workloads/multi_statement_transaction_all_commands_same_session.js ## - # Blacklists from concurrency_replication_multi_stmt_txn + # Denylists from concurrency_replication_multi_stmt_txn ## # Relies on having one thread observe writes from the other threads, which won't become visible @@ -122,7 +122,7 @@ selector: - jstests/concurrency/fsm_workloads/view_catalog_direct_system_writes.js ## - # Blacklists from concurrency_sharded_multi_stmt_txn + # Denylists from concurrency_sharded_multi_stmt_txn ## # Use updates that do not contain the shard key, so they are rejected before any commands are @@ -132,7 +132,7 @@ selector: - jstests/concurrency/fsm_workloads/update_rename_noindex.js ## - # Blacklists from concurrency_sharded_with_stepdowns + # Denylists from concurrency_sharded_with_stepdowns ## # ChunkHelper directly talks to the config servers and doesn't support retries for network errors @@ -158,7 +158,7 @@ selector: - jstests/concurrency/fsm_workloads/view_catalog_direct_system_writes.js ## - # Blacklists specific to this suite + # Denylists specific to this suite ## # Uses getMore in the same state function as a command not supported in a transaction. @@ -192,7 +192,7 @@ selector: # These start a transaction in one state function and use it in other state functions. This suite # would instead execute each state function as its own transaction. - state_functions_share_transaction - # Note that "requires_non_retryable_writes" does not need to be blacklisted because some writes + # Note that "requires_non_retryable_writes" does not need to be denylisted because some writes # that are not individually retryable can be retried if they are part of a transaction. # Tests which expect commands to fail and catch the error can cause transactions to abort and # retry indefinitely. diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml index 3860eef89b4..646976be262 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication.yml @@ -91,7 +91,7 @@ selector: - jstests/concurrency/fsm_workloads/yield_and_hashed.js - jstests/concurrency/fsm_workloads/yield_and_sorted.js - # TODO Unblacklist (SERVER-38852). + # TODO Undenylist (SERVER-38852). - jstests/concurrency/fsm_workloads/agg_out_interrupt_cleanup.js # serverStatus does not include transaction metrics on mongos. diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml index dd207dbb4b5..09ced04add2 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_replication_with_balancer.yml @@ -96,7 +96,7 @@ selector: - jstests/concurrency/fsm_workloads/yield_and_hashed.js - jstests/concurrency/fsm_workloads/yield_and_sorted.js - # TODO Unblacklist (SERVER-38852). + # TODO Undenylist (SERVER-38852). - jstests/concurrency/fsm_workloads/agg_out_interrupt_cleanup.js # serverStatus does not include transaction metrics on mongos. diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_replication_100ms_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_replication_100ms_refresh_jscore_passthrough.yml index 881632b973a..58dd5d38fa2 100644 --- a/buildscripts/resmokeconfig/suites/logical_session_cache_replication_100ms_refresh_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/logical_session_cache_replication_100ms_refresh_jscore_passthrough.yml @@ -17,7 +17,7 @@ selector: # The awaitdata_getmore_cmd.js test tails the oplog and waits for the getMore batch size to equal # zero. The CheckReplDBHashInBackground hook consistently runs and creates sessions. At the same # time, the logical session cache refresh thread will flush these sessions to disk, creating more - # opLog entries. To avoid this infinite loop, we will blacklist the test from this suite. + # opLog entries. To avoid this infinite loop, we will denylist the test from this suite. - jstests/core/awaitdata_getmore_cmd.js # These tests verify that an expected number of update operations were tracked in the server # status metrics, but the logical session cache refresh causes additional updates to be recorded. diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_replication_10sec_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_replication_10sec_refresh_jscore_passthrough.yml index 68a64326e4c..5e489dc3e64 100644 --- a/buildscripts/resmokeconfig/suites/logical_session_cache_replication_10sec_refresh_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/logical_session_cache_replication_10sec_refresh_jscore_passthrough.yml @@ -17,7 +17,7 @@ selector: # The awaitdata_getmore_cmd.js test tails the oplog and waits for the getMore batch size to equal # zero. The CheckReplDBHashInBackground hook consistently runs and creates sessions. At the same # time, the logical session cache refresh thread will flush these sessions to disk, creating more - # opLog entries. To avoid this infinite loop, we will blacklist the test from this suite. + # opLog entries. To avoid this infinite loop, we will denylist the test from this suite. - jstests/core/awaitdata_getmore_cmd.js # These tests verify that an expected number of update operations were tracked in the server # status metrics, but the logical session cache refresh causes additional updates to be recorded. diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_replication_1sec_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_replication_1sec_refresh_jscore_passthrough.yml index 8e411c7c58d..545b536f563 100644 --- a/buildscripts/resmokeconfig/suites/logical_session_cache_replication_1sec_refresh_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/logical_session_cache_replication_1sec_refresh_jscore_passthrough.yml @@ -17,7 +17,7 @@ selector: # The awaitdata_getmore_cmd.js test tails the oplog and waits for the getMore batch size to equal # zero. The CheckReplDBHashInBackground hook consistently runs and creates sessions. At the same # time, the logical session cache refresh thread will flush these sessions to disk, creating more - # opLog entries. To avoid this infinite loop, we will blacklist the test from this suite. + # opLog entries. To avoid this infinite loop, we will denylist the test from this suite. - jstests/core/awaitdata_getmore_cmd.js # These tests verify that an expected number of update operations were tracked in the server # status metrics, but the logical session cache refresh causes additional updates to be recorded. diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_replication_default_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_replication_default_refresh_jscore_passthrough.yml index 00929a968d5..c51f2b45837 100644 --- a/buildscripts/resmokeconfig/suites/logical_session_cache_replication_default_refresh_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/logical_session_cache_replication_default_refresh_jscore_passthrough.yml @@ -17,7 +17,7 @@ selector: # The awaitdata_getmore_cmd.js test tails the oplog and waits for the getMore batch size to equal # zero. The CheckReplDBHashInBackground hook consistently runs and creates sessions. At the same # time, the logical session cache refresh thread will flush these sessions to disk, creating more - # opLog entries. To prevent this infinite loop, we will blacklist the test from this suite. + # opLog entries. To prevent this infinite loop, we will denylist the test from this suite. - jstests/core/awaitdata_getmore_cmd.js # These tests verify that an expected number of update operations were tracked in the server # status metrics, but the logical session cache refresh causes additional updates to be recorded. diff --git a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml index 3f05c322ffd..9867c09384a 100644 --- a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml @@ -356,7 +356,7 @@ executor: # Note: fail_unclean_shutdown_incompatible_commands.js not included because it conflicts with # implicitly_shard_accessed_collections.js use of collstats (usage is safe with unclean # shutdown). Workaround by relying on the requires_fastcount/dbstats/collstats/datasize tags - # to blacklist tests that uses them unsafely. + # to denylist tests that uses them unsafely. eval: >- var testingReplication = true; load("jstests/libs/override_methods/mongos_manual_intervention_actions.js"); diff --git a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml index 379ec1c5036..23ea6a7f2b4 100644 --- a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml @@ -355,7 +355,7 @@ executor: # Note: fail_unclean_shutdown_incompatible_commands.js not included because it conflicts with # implicitly_shard_accessed_collections.js use of collstats (usage is safe with unclean # shutdown). Workaround by relying on the requires_fastcount/dbstats/collstats/datasize tags - # to blacklist tests that uses them unsafely. + # to denylist tests that uses them unsafely. eval: >- var testingReplication = true; load("jstests/libs/override_methods/mongos_manual_intervention_actions.js"); diff --git a/buildscripts/resmokeconfig/suites/multiversion.yml b/buildscripts/resmokeconfig/suites/multiversion.yml index bb1ec6b7023..a3692f67a7d 100644 --- a/buildscripts/resmokeconfig/suites/multiversion.yml +++ b/buildscripts/resmokeconfig/suites/multiversion.yml @@ -15,7 +15,7 @@ selector: - jstests/multiVersion/minor_version_tags_new_old_new.js # TODO SERVER-42919: recent work on the ReplicaSetMonitor means that mongoS no longer crashes when - # it attempts to connect to an upgraded mongoD. Un-blacklist when SERVER-42919 fixes this issue. + # it attempts to connect to an upgraded mongoD. Un-denylist when SERVER-42919 fixes this issue. - jstests/multiVersion/genericSetFCVUsage/crash_mongos_against_upgraded_cluster.js exclude_with_any_tags: - featureFlagToaster diff --git a/buildscripts/resmokeconfig/suites/multiversion_auth.yml b/buildscripts/resmokeconfig/suites/multiversion_auth.yml index 451c77dce5d..024e1d793b6 100644 --- a/buildscripts/resmokeconfig/suites/multiversion_auth.yml +++ b/buildscripts/resmokeconfig/suites/multiversion_auth.yml @@ -19,7 +19,7 @@ selector: - jstests/multiVersion/minor_version_tags_new_old_new.js # TODO SERVER-42919: recent work on the ReplicaSetMonitor means that mongoS no longer crashes when - # it attempts to connect to an upgraded mongoD. Un-blacklist when SERVER-42919 fixes this issue. + # it attempts to connect to an upgraded mongoD. Un-denylist when SERVER-42919 fixes this issue. - jstests/multiVersion/genericSetFCVUsage/crash_mongos_against_upgraded_cluster.js # Skip any tests that run with auth explicitly. diff --git a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml index de61c9c94c7..ead6263279a 100644 --- a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml @@ -1,6 +1,6 @@ test_kind: js_test -# This suite's blacklist is a sharded_collections_jscore_passthrough blacklist with some additions -# from causally_consistent_jscore_passthrough blacklist. +# This suite's denylist is a sharded_collections_jscore_passthrough denylist with some additions +# from causally_consistent_jscore_passthrough denylist. selector: roots: @@ -47,7 +47,7 @@ selector: - jstests/core/dbcase2.js - jstests/core/no_db_created.js - jstests/core/killop_drop_collection.js # Uses fsyncLock. - # Tests that need triaging & remediation | blacklist decision + # Tests that need triaging & remediation | denylist decision # Comments list possible problem point under review. - jstests/core/stages_delete.js # Uses stageDebug command for deletes. # Tests that fail for Causal Consistency as they have statements that do not support diff --git a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_read_concern_snapshot_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_read_concern_snapshot_passthrough.yml index e53df28eeb2..242cf97b557 100644 --- a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_read_concern_snapshot_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_read_concern_snapshot_passthrough.yml @@ -1,6 +1,6 @@ test_kind: js_test -# This suite's blacklist is a sharded_causally_consistent_jscore_passthrough blacklist with some -# additions from causally_consistent_read_concern_snapshot_passthrough blacklist. +# This suite's denylist is a sharded_causally_consistent_jscore_passthrough denylist with some +# additions from causally_consistent_read_concern_snapshot_passthrough denylist. selector: roots: @@ -48,7 +48,7 @@ selector: - jstests/core/dbcase2.js - jstests/core/no_db_created.js - jstests/core/killop_drop_collection.js # Uses fsyncLock. - # Tests that need triaging & remediation | blacklist decision + # Tests that need triaging & remediation | denylist decision # Comments list possible problem point under review. - jstests/core/stages_delete.js # Uses stageDebug command for deletes. # Tests that fail for Causal Consistency as they have statements that do not support diff --git a/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml b/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml index 8f3fede7663..0c5f5d33c9f 100644 --- a/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml +++ b/buildscripts/resmokeconfig/suites/sharding_continuous_config_stepdown.yml @@ -141,7 +141,7 @@ selector: # ShardingTest is never used, so continuous step down thread never starts - jstests/sharding/config_rs_change.js - jstests/sharding/empty_cluster_init.js - # Temporarily blacklisted until more robust + # Temporarily denylisted until more robust # Expects same secondaries for entire test - jstests/sharding/commands_that_write_accept_wc_configRS.js - jstests/sharding/commands_that_write_accept_wc_shards.js @@ -197,7 +197,7 @@ selector: # In this suite the cluster may end up in a state where each shard believes the # collection is sharded and the mongos believes it is unsharded. $merge is not # prepared to work correctly in this situation. This should be fixed by a future - # improvement in sharding infrastructure, and can be unblacklisted by SERVER-40172. + # improvement in sharding infrastructure, and can be undenylisted by SERVER-40172. - jstests/sharding/query/merge_to_existing.js # Sets a failpoint on find commands which can lead to a hang when a config steps down. - jstests/sharding/sharding_statistics_server_status.js diff --git a/buildscripts/resmokeconfig/suites/tenant_migration_causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/tenant_migration_causally_consistent_jscore_passthrough.yml index 459c2c0e357..09b03fe85d1 100644 --- a/buildscripts/resmokeconfig/suites/tenant_migration_causally_consistent_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/tenant_migration_causally_consistent_jscore_passthrough.yml @@ -14,7 +14,7 @@ selector: - jstests/core/**/*.js exclude_files: # - # Blacklists from tenant_migration_jscore_passthrough.yml + # Denylists from tenant_migration_jscore_passthrough.yml # - jstests/core/txns/**/*.js @@ -102,7 +102,7 @@ selector: - jstests/core/rename_collection_staytemp.js # - # Blacklists from causally_consistent_jscore_passthrough.yml + # Denylists from causally_consistent_jscore_passthrough.yml # - jstests/core/stages_delete.js # Uses stageDebug command for deletes. @@ -141,7 +141,7 @@ selector: - jstests/core/or_to_in.js # queryPlanner in different spot in explain() # - # Blacklists from session_jscore_passthrough.yml + # Denylists from session_jscore_passthrough.yml # # These test run commands using legacy queries, which are not supported on sessions. diff --git a/buildscripts/resmokeconfig/suites/tenant_migration_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/tenant_migration_kill_primary_jscore_passthrough.yml index 5182c7ece2c..e19b2719760 100644 --- a/buildscripts/resmokeconfig/suites/tenant_migration_kill_primary_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/tenant_migration_kill_primary_jscore_passthrough.yml @@ -152,7 +152,7 @@ selector: - jstests/core/validate_cmd_ns.js # Calls _exec() directly, not retryable. # - # Blacklists specific to this suite + # Denylists specific to this suite # - jstests/core/api_version_parameters.js diff --git a/buildscripts/resmokeconfig/suites/tenant_migration_stepdown_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/tenant_migration_stepdown_jscore_passthrough.yml index 29ad5bbbcb0..18d7ef78952 100644 --- a/buildscripts/resmokeconfig/suites/tenant_migration_stepdown_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/tenant_migration_stepdown_jscore_passthrough.yml @@ -152,7 +152,7 @@ selector: - jstests/core/validate_cmd_ns.js # Calls _exec() directly, not retryable. # - # Blacklists specific to this suite + # Denylists specific to this suite # - jstests/core/api_version_parameters.js diff --git a/buildscripts/resmokeconfig/suites/tenant_migration_terminate_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/tenant_migration_terminate_primary_jscore_passthrough.yml index 484f1cbee1f..e5186524cad 100644 --- a/buildscripts/resmokeconfig/suites/tenant_migration_terminate_primary_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/tenant_migration_terminate_primary_jscore_passthrough.yml @@ -152,7 +152,7 @@ selector: - jstests/core/validate_cmd_ns.js # Calls _exec() directly, not retryable. # - # Blacklists specific to this suite + # Denylists specific to this suite # - jstests/core/api_version_parameters.js diff --git a/buildscripts/resmokelib/powercycle/powercycle.py b/buildscripts/resmokelib/powercycle/powercycle.py index 43dada73b1d..2d89a6bdbf7 100755 --- a/buildscripts/resmokelib/powercycle/powercycle.py +++ b/buildscripts/resmokelib/powercycle/powercycle.py @@ -1415,7 +1415,7 @@ def main(parser_actions, options): # pylint: disable=too-many-branches,too-many else: eval_str = "" fsm_test_data = copy.deepcopy(crud_test_data) - fsm_test_data["fsmDbBlacklist"] = [powercycle_constants.DB_NAME] + fsm_test_data["fsmDbDenylist"] = [powercycle_constants.DB_NAME] crud_test_data["dbName"] = powercycle_constants.DB_NAME # Setup the mongo_repo_root. diff --git a/buildscripts/resmokelib/testing/hooks/tenant_migration.py b/buildscripts/resmokelib/testing/hooks/tenant_migration.py index 285c9683fe6..955e6d4ce74 100644 --- a/buildscripts/resmokelib/testing/hooks/tenant_migration.py +++ b/buildscripts/resmokelib/testing/hooks/tenant_migration.py @@ -360,7 +360,7 @@ class _TenantMigrationThread(threading.Thread): # pylint: disable=too-many-inst return abort_reason["code"] == self.FAIL_TO_PARSE_ERR_CODE and re.search( err_msg_regex, abort_reason["errmsg"]) - def _is_blacklisted_abort_reason(self, abort_reason): + def _is_denylisted_abort_reason(self, abort_reason): is_recipient_err = abort_reason["errmsg"].startswith( "Tenant migration recipient command failed") if not is_recipient_err: @@ -434,10 +434,10 @@ class _TenantMigrationThread(threading.Thread): # pylint: disable=too-many-inst "Tenant migration '%s' with donor replica set '%s' aborted due to failpoint: " + "%s.", migration_opts.migration_id, migration_opts.get_donor_name(), str(res)) return False - if self._is_blacklisted_abort_reason(abort_reason): + if self._is_denylisted_abort_reason(abort_reason): self.logger.info( "Tenant migration '%s' with donor replica set '%s' aborted due to a " + - "blacklisted error: %s.", migration_opts.migration_id, + "denylisted error: %s.", migration_opts.migration_id, migration_opts.get_donor_name(), str(res)) return False raise errors.ServerFailure("Tenant migration '" + str(migration_opts.migration_id) + diff --git a/buildscripts/tests/test_evergreen_generate_resmoke_tasks.py b/buildscripts/tests/test_evergreen_generate_resmoke_tasks.py index 6d2d752e1e2..4dbb2d1f4c8 100644 --- a/buildscripts/tests/test_evergreen_generate_resmoke_tasks.py +++ b/buildscripts/tests/test_evergreen_generate_resmoke_tasks.py @@ -1033,53 +1033,53 @@ class GenerateSubSuitesTest(unittest.TestCase): self.assertIn(tests_runtimes[1], filtered_list) @patch(ns('_parser.set_run_options')) - def test_filter_blacklist_files(self, set_run_options_mock): + def test_filter_denylist_files(self, set_run_options_mock): tests_runtimes = [ TestRuntime(test_name="dir1/file1.js", runtime=20.32), TestRuntime(test_name="dir2/file2.js", runtime=24.32), TestRuntime(test_name="dir1/file3.js", runtime=36.32), ] - blacklisted_test = tests_runtimes[1][0] + denylisted_test = tests_runtimes[1][0] with patch("os.path.exists") as exists_mock, patch(ns("suitesconfig")) as suitesconfig_mock: exists_mock.return_value = True evg = MagicMock() suitesconfig_mock.get_suite.return_value.tests = \ - [runtime[0] for runtime in tests_runtimes if runtime[0] != blacklisted_test] + [runtime[0] for runtime in tests_runtimes if runtime[0] != denylisted_test] config_options = MagicMock(suite="suite") gen_sub_suites = under_test.GenerateSubSuites(evg, config_options) filtered_list = gen_sub_suites.filter_existing_tests(tests_runtimes) self.assertEqual(2, len(filtered_list)) - self.assertNotIn(blacklisted_test, filtered_list) + self.assertNotIn(denylisted_test, filtered_list) self.assertIn(tests_runtimes[2], filtered_list) self.assertIn(tests_runtimes[0], filtered_list) @patch(ns('_parser.set_run_options')) - def test_filter_blacklist_files_for_windows(self, set_run_options_mock): + def test_filter_denylist_files_for_windows(self, set_run_options_mock): tests_runtimes = [ TestRuntime(test_name="dir1/file1.js", runtime=20.32), TestRuntime(test_name="dir2/file2.js", runtime=24.32), TestRuntime(test_name="dir1/dir3/file3.js", runtime=36.32), ] - blacklisted_test = tests_runtimes[1][0] + denylisted_test = tests_runtimes[1][0] with patch("os.path.exists") as exists_mock, patch(ns("suitesconfig")) as suitesconfig_mock: exists_mock.return_value = True evg = MagicMock() suitesconfig_mock.get_suite.return_value.tests = [ runtime[0].replace("/", "\\") for runtime in tests_runtimes - if runtime[0] != blacklisted_test + if runtime[0] != denylisted_test ] config_options = MagicMock(suite="suite") gen_sub_suites = under_test.GenerateSubSuites(evg, config_options) filtered_list = gen_sub_suites.filter_existing_tests(tests_runtimes) - self.assertNotIn(blacklisted_test, filtered_list) + self.assertNotIn(denylisted_test, filtered_list) self.assertIn(tests_runtimes[2], filtered_list) self.assertIn(tests_runtimes[0], filtered_list) self.assertEqual(2, len(filtered_list)) diff --git a/etc/backports_required_for_multiversion_tests.yml b/etc/backports_required_for_multiversion_tests.yml index c7e2901bfa2..c07a35dcfff 100644 --- a/etc/backports_required_for_multiversion_tests.yml +++ b/etc/backports_required_for_multiversion_tests.yml @@ -1,8 +1,8 @@ -# This file is intended to track tests that should be blacklisted from multiversion testing due to +# This file is intended to track tests that should be denylisted from multiversion testing due to # changes that have not yet been backported to the last-lts development branch. # # Usage: -# Add the server ticket number and the path to the test file for the test you intend to blacklist +# Add the server ticket number and the path to the test file for the test you intend to denylist # under the appropriate suite. Any test in a (ticket, test_file) pair that appears in this file but # not in the last-lts branch version of this file indicates that a commit has not yet been # backported to the last-lts branch and will be excluded from the multiversion suite @@ -13,7 +13,7 @@ # - ticket: SERVER-1000 # test_file: jstests/core/my_test_file.js # -# The above example will blacklist jstests/core/my_test_file.js from the +# The above example will denylist jstests/core/my_test_file.js from the # 'replica_sets_multiversion_gen' task until this file has been updated with the same # (ticket, test_file) pair on the last-lts branch. # diff --git a/etc/tsan.suppressions b/etc/tsan.suppressions index f02173b5799..00411446443 100644 --- a/etc/tsan.suppressions +++ b/etc/tsan.suppressions @@ -4,7 +4,7 @@ signal:src/mongo/unittest/death_test.cpp # WiredTiger is known to cause false positives for data races because it uses a # nonstandard thread model that TSAN doesn't know how to deal with. We have -# already blacklisted WiredTiger in TSAN, but that only affects threads created +# already denylisted WiredTiger in TSAN, but that only affects threads created # within the WiredTiger source. For threads that call *into* WiredTiger, we # need to add suppressions so we still get any potential failures from # elsewhere. diff --git a/jstests/change_streams/allowlist.js b/jstests/change_streams/allowlist.js index 12aed93501d..f2255e70330 100644 --- a/jstests/change_streams/allowlist.js +++ b/jstests/change_streams/allowlist.js @@ -25,9 +25,9 @@ const allowlist = [ ]; // List of stages which the allowlist mechanism will prevent from running in a $changeStream. -// Does not include stages which are blacklisted but already implicitly prohibited, e.g. both +// Does not include stages which are denylisted but already implicitly prohibited, e.g. both // $currentOp and $changeStream must be the first stage in a pipeline. -const blacklist = [ +const denylist = [ {$group: {_id: "$_id"}}, {$sort: {_id: 1}}, {$skip: 100}, @@ -58,8 +58,8 @@ for (let allowedStage of allowlist) { assert.commandWorked(db.runCommand( {aggregate: coll.getName(), pipeline: changeStream.concat(allowlist), cursor: {}})); -// Verify that a $changeStream pipeline fails to validate if a blacklisted stage is present. -for (let bannedStage of blacklist) { +// Verify that a $changeStream pipeline fails to validate if a denylisted stage is present. +for (let bannedStage of denylist) { assertErrorCode(coll, changeStream.concat(bannedStage), ErrorCodes.IllegalOperation); } }()); diff --git a/jstests/change_streams/pipeline_cannot_modify_id_field.js b/jstests/change_streams/pipeline_cannot_modify_id_field.js index 9c9516c4a2b..27a54c99690 100644 --- a/jstests/change_streams/pipeline_cannot_modify_id_field.js +++ b/jstests/change_streams/pipeline_cannot_modify_id_field.js @@ -128,7 +128,7 @@ for (let transform of idPreservingTransformations) { }, transform); } -// Verify that each of the blacklisted transformations above are rejected. +// Verify that each of the denylisted transformations above are rejected. for (let transform of idModifyingTransformations) { const cmdRes = assert.commandWorked( db.runCommand( diff --git a/site_scons/site_tools/ccache.py b/site_scons/site_tools/ccache.py index 2a894919f8d..de7d03e5472 100644 --- a/site_scons/site_tools/ccache.py +++ b/site_scons/site_tools/ccache.py @@ -144,8 +144,8 @@ def generate(env): # hash result to prevent erroneous cache hits. if "CCACHE_EXTRAFILES" in env and env["CCACHE_EXTRAFILES"]: env["ENV"]["CCACHE_EXTRAFILES"] = ":".join([ - blackfile.path - for blackfile in env["CCACHE_EXTRAFILES"] + denyfile.path + for denyfile in env["CCACHE_EXTRAFILES"] ]) # Make a generator to expand to CCACHE in the case where we are diff --git a/site_scons/site_tools/mongo_test_execution.py b/site_scons/site_tools/mongo_test_execution.py index 1a7cab79e59..c60d5c6e164 100644 --- a/site_scons/site_tools/mongo_test_execution.py +++ b/site_scons/site_tools/mongo_test_execution.py @@ -43,7 +43,7 @@ def generate_test_execution_aliases(env, test): # Strip suffix dot_idx = source_base_name.rfind(".") suffix = source_base_name[dot_idx:] - if suffix in env["TEST_EXECUTION_SUFFIX_BLACKLIST"]: + if suffix in env["TEST_EXECUTION_SUFFIX_DENYLIST"]: continue source_name = source_base_name[:dot_idx] @@ -70,8 +70,8 @@ def generate(env): env.Alias("test-execution-aliases") env.AddMethod(generate_test_execution_aliases, "GenerateTestExecutionAliases") - env["TEST_EXECUTION_SUFFIX_BLACKLIST"] = env.get( - "TEST_EXECUTION_SUFFIX_BLACKLIST", [".in"] + env["TEST_EXECUTION_SUFFIX_DENYLIST"] = env.get( + "TEST_EXECUTION_SUFFIX_DENYLIST", [".in"] ) # TODO: Remove when the new ninja generator is the only supported generator diff --git a/site_scons/site_tools/next/ccache.py b/site_scons/site_tools/next/ccache.py index 2a894919f8d..de7d03e5472 100644 --- a/site_scons/site_tools/next/ccache.py +++ b/site_scons/site_tools/next/ccache.py @@ -144,8 +144,8 @@ def generate(env): # hash result to prevent erroneous cache hits. if "CCACHE_EXTRAFILES" in env and env["CCACHE_EXTRAFILES"]: env["ENV"]["CCACHE_EXTRAFILES"] = ":".join([ - blackfile.path - for blackfile in env["CCACHE_EXTRAFILES"] + denyfile.path + for denyfile in env["CCACHE_EXTRAFILES"] ]) # Make a generator to expand to CCACHE in the case where we are diff --git a/site_scons/site_tools/next/mongo_test_execution.py b/site_scons/site_tools/next/mongo_test_execution.py index b7b783c006e..2433e446c8c 100644 --- a/site_scons/site_tools/next/mongo_test_execution.py +++ b/site_scons/site_tools/next/mongo_test_execution.py @@ -72,7 +72,7 @@ def generate_test_execution_aliases(env, test): # Strip suffix dot_idx = source_base_name.rfind(".") suffix = source_base_name[dot_idx:] - if suffix in env["TEST_EXECUTION_SUFFIX_BLACKLIST"]: + if suffix in env["TEST_EXECUTION_SUFFIX_DENYLIST"]: continue source_name = source_base_name[:dot_idx] @@ -137,8 +137,8 @@ def generate(env): env.Alias("test-execution-aliases") env.AddMethod(generate_test_execution_aliases, "GenerateTestExecutionAliases") - env["TEST_EXECUTION_SUFFIX_BLACKLIST"] = env.get( - "TEST_EXECUTION_SUFFIX_BLACKLIST", [".in"] + env["TEST_EXECUTION_SUFFIX_DENYLIST"] = env.get( + "TEST_EXECUTION_SUFFIX_DENYLIST", [".in"] ) env.AppendUnique( diff --git a/src/mongo/client/connpool.h b/src/mongo/client/connpool.h index a979128f7ac..68252aff2a0 100644 --- a/src/mongo/client/connpool.h +++ b/src/mongo/client/connpool.h @@ -357,7 +357,7 @@ public: void clear(); /** - * Checks whether the connection for a given host is black listed or not. + * Checks whether the connection for a given host is deny listed or not. * * @param hostName the name of the host the connection connects to. * @param conn the connection to check. diff --git a/src/mongo/db/pipeline/document_source_internal_convert_bucket_index_stats.h b/src/mongo/db/pipeline/document_source_internal_convert_bucket_index_stats.h index fe4ae8c886e..498518ee951 100644 --- a/src/mongo/db/pipeline/document_source_internal_convert_bucket_index_stats.h +++ b/src/mongo/db/pipeline/document_source_internal_convert_bucket_index_stats.h @@ -74,7 +74,7 @@ public: TransactionRequirement::kAllowed, LookupRequirement::kAllowed, UnionRequirement::kAllowed, - ChangeStreamRequirement::kBlacklist}; + ChangeStreamRequirement::kDenylist}; } Value serialize(boost::optional<ExplainOptions::Verbosity> explain = boost::none) const final; diff --git a/src/mongo/db/pipeline/document_source_internal_shard_filter.h b/src/mongo/db/pipeline/document_source_internal_shard_filter.h index 803ff1be41a..d5f18fd1ab8 100644 --- a/src/mongo/db/pipeline/document_source_internal_shard_filter.h +++ b/src/mongo/db/pipeline/document_source_internal_shard_filter.h @@ -61,7 +61,7 @@ public: TransactionRequirement::kNotAllowed, LookupRequirement::kNotAllowed, UnionRequirement::kNotAllowed, - ChangeStreamRequirement::kBlacklist); + ChangeStreamRequirement::kDenylist); } Value serialize( diff --git a/src/mongo/db/pipeline/document_source_internal_unpack_bucket.h b/src/mongo/db/pipeline/document_source_internal_unpack_bucket.h index 5477dbe586b..bb6652edf50 100644 --- a/src/mongo/db/pipeline/document_source_internal_unpack_bucket.h +++ b/src/mongo/db/pipeline/document_source_internal_unpack_bucket.h @@ -82,7 +82,7 @@ public: TransactionRequirement::kAllowed, LookupRequirement::kAllowed, UnionRequirement::kAllowed, - ChangeStreamRequirement::kBlacklist}; + ChangeStreamRequirement::kDenylist}; } DepsTracker::State getDependencies(DepsTracker* deps) const final { diff --git a/src/mongo/db/pipeline/document_source_sort.h b/src/mongo/db/pipeline/document_source_sort.h index 74ca011def5..622641bbb96 100644 --- a/src/mongo/db/pipeline/document_source_sort.h +++ b/src/mongo/db/pipeline/document_source_sort.h @@ -66,7 +66,7 @@ public: TransactionRequirement::kAllowed, LookupRequirement::kAllowed, UnionRequirement::kAllowed, - ChangeStreamRequirement::kBlacklist); + ChangeStreamRequirement::kDenylist); // Can't swap with a $match if a limit has been absorbed, as $match can't swap with $limit. constraints.canSwapWithMatch = !_sortExecutor->hasLimit(); diff --git a/src/mongo/db/pipeline/stage_constraints.h b/src/mongo/db/pipeline/stage_constraints.h index 859a422ffe8..661b9954195 100644 --- a/src/mongo/db/pipeline/stage_constraints.h +++ b/src/mongo/db/pipeline/stage_constraints.h @@ -86,9 +86,9 @@ struct StageConstraints { /** * A ChangeStreamRequirement determines whether a particular stage is itself a ChangeStream * stage, whether it is allowed to exist in a $changeStream pipeline, or whether it is - * blacklisted from $changeStream. + * denylisted from $changeStream. */ - enum class ChangeStreamRequirement { kChangeStreamStage, kAllowlist, kBlacklist }; + enum class ChangeStreamRequirement { kChangeStreamStage, kAllowlist, kDenylist }; /** * A FacetRequirement indicates whether this stage may be used within a $facet pipeline. @@ -149,7 +149,7 @@ struct StageConstraints { TransactionRequirement transactionRequirement, LookupRequirement lookupRequirement, UnionRequirement unionRequirement, - ChangeStreamRequirement changeStreamRequirement = ChangeStreamRequirement::kBlacklist) + ChangeStreamRequirement changeStreamRequirement = ChangeStreamRequirement::kDenylist) : requiredPosition(requiredPosition), hostRequirement(hostRequirement), diskRequirement(diskRequirement), @@ -229,7 +229,7 @@ struct StageConstraints { * True if this stage is permitted to run in a pipeline which starts with $changeStream. */ bool isAllowedInChangeStream() const { - return changeStreamRequirement != ChangeStreamRequirement::kBlacklist; + return changeStreamRequirement != ChangeStreamRequirement::kDenylist; } /** diff --git a/src/mongo/s/hedge_options_util_test.cpp b/src/mongo/s/hedge_options_util_test.cpp index fcd5f48b6ff..7ea69523cad 100644 --- a/src/mongo/s/hedge_options_util_test.cpp +++ b/src/mongo/s/hedge_options_util_test.cpp @@ -122,7 +122,7 @@ TEST_F(HedgeOptionsUtilTestFixture, ImplicitOperationHedging) { checkHedgeOptions(parameters, cmdObj, rspObj, true); } -TEST_F(HedgeOptionsUtilTestFixture, BlacklistAggregate) { +TEST_F(HedgeOptionsUtilTestFixture, DenylistAggregate) { const auto parameters = BSONObj(); const auto cmdObj = BSON("aggregate" << kCollName << "pipeline" << BSONObj() << "cursor" << BSONObj()); @@ -133,7 +133,7 @@ TEST_F(HedgeOptionsUtilTestFixture, BlacklistAggregate) { checkHedgeOptions(parameters, cmdObj, rspObj, false); } -TEST_F(HedgeOptionsUtilTestFixture, BlacklistMapReduce) { +TEST_F(HedgeOptionsUtilTestFixture, DenylistMapReduce) { const auto parameters = BSONObj(); const auto rspObj = BSON("mode" << "nearest" diff --git a/src/mongo/shell/session.js b/src/mongo/shell/session.js index d8988fb2fd8..8fc0e98f617 100644 --- a/src/mongo/shell/session.js +++ b/src/mongo/shell/session.js @@ -148,7 +148,7 @@ var { wireVersion <= client.getMaxWireVersion(); } - // TODO: Update this allowlist, or convert it to a blacklist depending on the outcome of + // TODO: Update this allowlist, or convert it to a denylist depending on the outcome of // SERVER-31743. const kCommandsThatSupportReadConcern = new Set([ "aggregate", |