From 1e04b72f6d831823120d989068e52abeb5477601 Mon Sep 17 00:00:00 2001 From: Simon Unge Date: Thu, 12 Jun 2025 01:04:04 +0000 Subject: [PATCH 1/6] Add opt in initial check run (cherry picked from commit 2d2c70cc7c496ea20831235050421fdaad2cc84b) --- deps/rabbit/Makefile | 2 +- deps/rabbit/ct.test.spec | 1 + deps/rabbit/priv/schema/rabbit.schema | 10 ++ deps/rabbit/src/rabbit.erl | 49 +++++- deps/rabbit/test/node_initial_run_SUITE.erl | 168 ++++++++++++++++++++ 5 files changed, 227 insertions(+), 3 deletions(-) create mode 100644 deps/rabbit/test/node_initial_run_SUITE.erl diff --git a/deps/rabbit/Makefile b/deps/rabbit/Makefile index 0a786304751c..a6b42dfc571d 100644 --- a/deps/rabbit/Makefile +++ b/deps/rabbit/Makefile @@ -264,7 +264,7 @@ PARALLEL_CT_SET_1_D = amqqueue_backward_compatibility channel_interceptor channe PARALLEL_CT_SET_2_A = cluster confirms_rejects consumer_timeout rabbit_access_control rabbit_confirms rabbit_core_metrics_gc rabbit_cuttlefish rabbit_db_binding rabbit_db_exchange PARALLEL_CT_SET_2_B = clustering_recovery crashing_queues deprecated_features direct_exchange_routing_v2 disconnect_detected_during_alarm exchanges unit_gen_server2 -PARALLEL_CT_SET_2_C = disk_monitor dynamic_qq unit_disk_monitor unit_file_handle_cache unit_log_management unit_operator_policy +PARALLEL_CT_SET_2_C = disk_monitor dynamic_qq unit_disk_monitor unit_file_handle_cache unit_log_management unit_operator_policy node_initial_run PARALLEL_CT_SET_2_D = queue_length_limits queue_parallel quorum_queue_member_reconciliation rabbit_fifo rabbit_fifo_dlx rabbit_stream_coordinator PARALLEL_CT_SET_3_A = definition_import per_user_connection_channel_limit_partitions per_vhost_connection_limit_partitions policy priority_queue_recovery rabbit_fifo_v0 rabbit_stream_sac_coordinator_v4 rabbit_stream_sac_coordinator unit_credit_flow unit_queue_consumers unit_queue_location unit_quorum_queue diff --git a/deps/rabbit/ct.test.spec b/deps/rabbit/ct.test.spec index 1056fa164051..b118b5dab3a5 100644 --- a/deps/rabbit/ct.test.spec +++ b/deps/rabbit/ct.test.spec @@ -43,6 +43,7 @@ , disk_monitor_SUITE , dynamic_qq_SUITE , exchanges_SUITE +, node_initial_run_SUITE , rabbit_stream_queue_SUITE ]}. diff --git a/deps/rabbit/priv/schema/rabbit.schema b/deps/rabbit/priv/schema/rabbit.schema index ba20e864fdb3..4fcda083fbb0 100644 --- a/deps/rabbit/priv/schema/rabbit.schema +++ b/deps/rabbit/priv/schema/rabbit.schema @@ -1646,6 +1646,16 @@ end}. {datatype, string} ]}. + +%% Whether to verify if this is the first time a node starts. +%% When enabled, nodes will create a marker file on first startup +%% and refuse to start if the marker exists but tables are empty. +%% + +{mapping, "verify_initial_run", "rabbit.verify_initial_run", [ + {datatype, {enum, [true, false]}} +]}. + % ========================== % Logging section % ========================== diff --git a/deps/rabbit/src/rabbit.erl b/deps/rabbit/src/rabbit.erl index 20bd4765b2a3..a194385431a3 100644 --- a/deps/rabbit/src/rabbit.erl +++ b/deps/rabbit/src/rabbit.erl @@ -40,7 +40,7 @@ %% Boot steps. -export([update_cluster_tags/0, maybe_insert_default_data/0, boot_delegate/0, recover/0, pg_local_amqp_session/0, - pg_local_amqp_connection/0]). + pg_local_amqp_connection/0, check_initial_run/0]). -rabbit_boot_step({pre_boot, [{description, "rabbit boot start"}]}). @@ -199,10 +199,16 @@ {requires, [core_initialized]}, {enables, routing_ready}]}). +-rabbit_boot_step({initial_run_check, + [{description, "check if this is the first time the node starts"}, + {mfa, {?MODULE, check_initial_run, []}}, + {requires, recovery}, + {enables, empty_db_check}]}). + -rabbit_boot_step({empty_db_check, [{description, "empty DB check"}, {mfa, {?MODULE, maybe_insert_default_data, []}}, - {requires, recovery}, + {requires, initial_run_check}, {enables, routing_ready}]}). @@ -235,6 +241,7 @@ {requires, [core_initialized, recovery]}, {enables, routing_ready}]}). + -rabbit_boot_step({pre_flight, [{description, "ready to communicate with peers and clients"}, {requires, [core_initialized, recovery, routing_ready]}]}). @@ -1151,6 +1158,44 @@ update_cluster_tags() -> #{domain => ?RMQLOG_DOMAIN_GLOBAL}), rabbit_runtime_parameters:set_global(cluster_tags, Tags, <<"internal_user">>). + +-spec check_initial_run() -> 'ok' | no_return(). + +check_initial_run() -> + case application:get_env(rabbit, verify_initial_run, false) of + false -> + %% Feature is disabled, skip the check + ?LOG_DEBUG("Initial run verification is disabled", + #{domain => ?RMQLOG_DOMAIN_GLOBAL}), + ok; + true -> + %% Feature is enabled, perform the check + DataDir = data_dir(), + MarkerFile = filename:join(DataDir, "node_initialized.marker"), + case filelib:is_file(MarkerFile) of + true -> + %% Not the first run, check if tables need default data + case rabbit_table:needs_default_data() of + true -> + ?LOG_ERROR("Node has already been initialized, but database appears empty. " + "This could indicate data loss or a split-brain scenario.", + #{domain => ?RMQLOG_DOMAIN_GLOBAL}), + throw({error, cluster_already_initialized_but_tables_empty}); + false -> + ?LOG_INFO("Node has already been initialized, proceeding with normal startup", + #{domain => ?RMQLOG_DOMAIN_GLOBAL}), + ok + end; + false -> + %% First time starting, create the marker file + ?LOG_INFO("First node startup detected, creating initialization marker", + #{domain => ?RMQLOG_DOMAIN_GLOBAL}), + ok = filelib:ensure_dir(MarkerFile), + ok = file:write_file(MarkerFile, <<>>, [exclusive]), % Empty file. + ok + end + end. + -spec maybe_insert_default_data() -> 'ok'. maybe_insert_default_data() -> diff --git a/deps/rabbit/test/node_initial_run_SUITE.erl b/deps/rabbit/test/node_initial_run_SUITE.erl new file mode 100644 index 000000000000..4816cf7d02fa --- /dev/null +++ b/deps/rabbit/test/node_initial_run_SUITE.erl @@ -0,0 +1,168 @@ +%% This Source Code Form is subject to the terms of the Mozilla Public +%% License, v. 2.0. If a copy of the MPL was not distributed with this +%% file, You can obtain one at https://mozilla.org/MPL/2.0/. +%% +%% Copyright (c) 2007-2024 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries. All rights reserved. +%% + +%% Test suite for the verify_initial_run feature. +%% This feature helps detect potential data loss scenarios by maintaining +%% a marker file to track if a node has been initialized before. + +-module(node_initial_run_SUITE). + +-include_lib("common_test/include/ct.hrl"). +-include_lib("eunit/include/eunit.hrl"). + +-compile(export_all). + +all() -> + [ + {group, single_node_mnesia}, + {group, single_node_khepri} + ]. + +groups() -> + [ + {single_node_mnesia, [], [ + verify_initial_run_disabled, + verify_initial_run_enabled + ]}, + {single_node_khepri, [], [ + verify_initial_run_disabled, + verify_initial_run_enabled + ]} + ]. + +%% ------------------------------------------------------------------- +%% Testsuite setup/teardown. +%% ------------------------------------------------------------------- + +init_per_suite(Config) -> + rabbit_ct_helpers:log_environment(), + rabbit_ct_helpers:run_setup_steps(Config). + +end_per_suite(Config) -> + rabbit_ct_helpers:run_teardown_steps(Config). + +init_per_group(Groupname, Config) -> + Config0 = rabbit_ct_helpers:set_config(Config, [ + {metadata_store, meta_store(Groupname)}, + {rmq_nodes_clustered, false}, + {rmq_nodename_suffix, Groupname}, + {rmq_nodes_count, 1} + ]), + rabbit_ct_helpers:run_steps( + Config0, + rabbit_ct_broker_helpers:setup_steps() ++ + rabbit_ct_client_helpers:setup_steps() + ). + +end_per_group(_, Config) -> + rabbit_ct_helpers:run_steps( + Config, + rabbit_ct_client_helpers:teardown_steps() ++ + rabbit_ct_broker_helpers:teardown_steps() + ). + +init_per_testcase(Testcase, Config) -> + rabbit_ct_helpers:testcase_started(Config, Testcase), + Config. + +end_per_testcase(Testcase, Config) -> + rabbit_ct_helpers:testcase_finished(Config, Testcase). + +%% ------------------------------------------------------------------- +%% Test cases +%% ------------------------------------------------------------------- + +verify_initial_run_disabled(Config) -> + % When feature is disabled (default), node should start normally + DataDir = rabbit_ct_broker_helpers:get_node_config(Config, 0, data_dir), + MarkerFile = filename:join(DataDir, "node_initialized.marker"), + % Setting is disabled so no marker file should be present + ?assertNot(filelib:is_file(MarkerFile)), + + % Restarting the node should work fine + ok = stop_app(Config), + set_env(Config, false), + ok = start_app(Config), + % Still no marker file + ?assertNot(filelib:is_file(MarkerFile)), + ok. + +verify_initial_run_enabled(Config) -> + DataDir = rabbit_ct_broker_helpers:get_node_config(Config, 0, data_dir), + MarkerFile = filename:join(DataDir, "node_initialized.marker"), + + ok = stop_app(Config), + set_env(Config, true), + ok = start_app(Config), + % Setting is enabled so marker file should be present after initial startup + ?assert(filelib:is_file(MarkerFile)), + + % Restarting the node should be fine, as there is a marker file + % and corresponding schema data (consistent state) + + ok = stop_app(Config), + ok = start_app(Config), + + SchemaFile = schema_file(Config), + + ?assert(filelib:is_file(MarkerFile)), + + % Stop the node and remove the present schema to simulate data loss + ok = stop_app(Config), + file:delete(SchemaFile), + % Node should fail to start because marker exists but schema is missing, + % indicating potential data loss or corruption + ?assertMatch( + {error, 69, _}, + start_app(Config) + ), + ok. + +%% ------------------------------------------------------------------- +%% Internal helpers +%% ------------------------------------------------------------------- + +stop_app(Config) -> + Node = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename), + case rabbit_ct_broker_helpers:rabbitmqctl(Config, Node, ["stop_app"]) of + {ok, _} -> ok; + Error -> Error + end. + +start_app(Config) -> + Node = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename), + case rabbit_ct_broker_helpers:rabbitmqctl(Config, Node, ["start_app"]) of + {ok, _} -> ok; + Error -> Error + end. + +maybe_enable_verify_initial_run(Config, verify_initial_run_enabled) -> + rabbit_ct_helpers:merge_app_env( + Config, {rabbit, [{verify_initial_run, true}]} + ); +maybe_enable_verify_initial_run(Config, _) -> + Config. + +meta_store(single_node_mnesia) -> + mnesia; +meta_store(single_node_khepri) -> + khepri. + +schema_file(Config) -> + DataDir = rabbit_ct_broker_helpers:get_node_config(Config, 0, data_dir), + MetaStore = rabbit_ct_helpers:get_config(Config, metadata_store), + case MetaStore of + mnesia -> + filename:join(DataDir, "schema.DAT"); + khepri -> + NodeName = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename), + filename:join([DataDir, "coordination", NodeName, "names.dets"]) + end. + +set_env(Config, Bool) -> + Node = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename), + ok = rpc:call(Node, application, set_env, [rabbit, verify_initial_run, Bool]). From 8ab2bda4ebd876d47077be92c31279ecfb1e493a Mon Sep 17 00:00:00 2001 From: Simon Unge Date: Tue, 24 Jun 2025 20:24:53 +0000 Subject: [PATCH 2/6] Rename (cherry picked from commit 77cec4930ef48798360b0fc418e236fe8be5407c) --- deps/rabbit/priv/schema/rabbit.schema | 2 +- deps/rabbit/src/rabbit.erl | 12 +++++------ deps/rabbit/test/node_initial_run_SUITE.erl | 22 ++++++++++----------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/deps/rabbit/priv/schema/rabbit.schema b/deps/rabbit/priv/schema/rabbit.schema index 4fcda083fbb0..f5b79370fcd6 100644 --- a/deps/rabbit/priv/schema/rabbit.schema +++ b/deps/rabbit/priv/schema/rabbit.schema @@ -1652,7 +1652,7 @@ end}. %% and refuse to start if the marker exists but tables are empty. %% -{mapping, "verify_initial_run", "rabbit.verify_initial_run", [ +{mapping, "prevent_startup_if_node_was_reset", "rabbit.prevent_startup_if_node_was_reset", [ {datatype, {enum, [true, false]}} ]}. diff --git a/deps/rabbit/src/rabbit.erl b/deps/rabbit/src/rabbit.erl index a194385431a3..ec3eecb1f6d2 100644 --- a/deps/rabbit/src/rabbit.erl +++ b/deps/rabbit/src/rabbit.erl @@ -40,7 +40,7 @@ %% Boot steps. -export([update_cluster_tags/0, maybe_insert_default_data/0, boot_delegate/0, recover/0, pg_local_amqp_session/0, - pg_local_amqp_connection/0, check_initial_run/0]). + pg_local_amqp_connection/0, prevent_startup_if_node_was_reset/0]). -rabbit_boot_step({pre_boot, [{description, "rabbit boot start"}]}). @@ -201,7 +201,7 @@ -rabbit_boot_step({initial_run_check, [{description, "check if this is the first time the node starts"}, - {mfa, {?MODULE, check_initial_run, []}}, + {mfa, {?MODULE, prevent_startup_if_node_was_reset, []}}, {requires, recovery}, {enables, empty_db_check}]}). @@ -1159,13 +1159,13 @@ update_cluster_tags() -> rabbit_runtime_parameters:set_global(cluster_tags, Tags, <<"internal_user">>). --spec check_initial_run() -> 'ok' | no_return(). +-spec prevent_startup_if_node_was_reset() -> 'ok' | no_return(). -check_initial_run() -> - case application:get_env(rabbit, verify_initial_run, false) of +prevent_startup_if_node_was_reset() -> + case application:get_env(rabbit, prevent_startup_if_node_was_reset, false) of false -> %% Feature is disabled, skip the check - ?LOG_DEBUG("Initial run verification is disabled", + ?LOG_DEBUG("prevent_startup_if_node_was_reset is disabled", #{domain => ?RMQLOG_DOMAIN_GLOBAL}), ok; true -> diff --git a/deps/rabbit/test/node_initial_run_SUITE.erl b/deps/rabbit/test/node_initial_run_SUITE.erl index 4816cf7d02fa..627248252c46 100644 --- a/deps/rabbit/test/node_initial_run_SUITE.erl +++ b/deps/rabbit/test/node_initial_run_SUITE.erl @@ -5,7 +5,7 @@ %% Copyright (c) 2007-2024 Broadcom. All Rights Reserved. The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries. All rights reserved. %% -%% Test suite for the verify_initial_run feature. +%% Test suite for the prevent_startup_if_node_was_reset feature. %% This feature helps detect potential data loss scenarios by maintaining %% a marker file to track if a node has been initialized before. @@ -25,12 +25,12 @@ all() -> groups() -> [ {single_node_mnesia, [], [ - verify_initial_run_disabled, - verify_initial_run_enabled + prevent_startup_if_node_was_reset_disabled, + prevent_startup_if_node_was_reset_enabled ]}, {single_node_khepri, [], [ - verify_initial_run_disabled, - verify_initial_run_enabled + prevent_startup_if_node_was_reset_disabled, + prevent_startup_if_node_was_reset_enabled ]} ]. @@ -76,7 +76,7 @@ end_per_testcase(Testcase, Config) -> %% Test cases %% ------------------------------------------------------------------- -verify_initial_run_disabled(Config) -> +prevent_startup_if_node_was_reset_disabled(Config) -> % When feature is disabled (default), node should start normally DataDir = rabbit_ct_broker_helpers:get_node_config(Config, 0, data_dir), MarkerFile = filename:join(DataDir, "node_initialized.marker"), @@ -91,7 +91,7 @@ verify_initial_run_disabled(Config) -> ?assertNot(filelib:is_file(MarkerFile)), ok. -verify_initial_run_enabled(Config) -> +prevent_startup_if_node_was_reset_enabled(Config) -> DataDir = rabbit_ct_broker_helpers:get_node_config(Config, 0, data_dir), MarkerFile = filename:join(DataDir, "node_initialized.marker"), @@ -140,11 +140,11 @@ start_app(Config) -> Error -> Error end. -maybe_enable_verify_initial_run(Config, verify_initial_run_enabled) -> +maybe_enable_prevent_startup_if_node_was_reset(Config, prevent_startup_if_node_was_reset_enabled) -> rabbit_ct_helpers:merge_app_env( - Config, {rabbit, [{verify_initial_run, true}]} + Config, {rabbit, [{prevent_startup_if_node_was_reset, true}]} ); -maybe_enable_verify_initial_run(Config, _) -> +maybe_enable_prevent_startup_if_node_was_reset(Config, _) -> Config. meta_store(single_node_mnesia) -> @@ -165,4 +165,4 @@ schema_file(Config) -> set_env(Config, Bool) -> Node = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename), - ok = rpc:call(Node, application, set_env, [rabbit, verify_initial_run, Bool]). + ok = rpc:call(Node, application, set_env, [rabbit, prevent_startup_if_node_was_reset, Bool]). From 7810b4e0186fdaae6fce9247547df4eb8c5176fe Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Wed, 25 Jun 2025 15:46:17 +0400 Subject: [PATCH 3/6] More renaming #14087, add new test suite to a parallel CT group (cherry picked from commit 5f1ab1409ff33f51fde535c5ffc22b43b2347a1c) --- deps/rabbit/Makefile | 4 ++-- deps/rabbit/src/rabbit.erl | 6 +++--- ...UITE.erl => prevent_startup_if_node_was_reset_SUITE.erl} | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename deps/rabbit/test/{node_initial_run_SUITE.erl => prevent_startup_if_node_was_reset_SUITE.erl} (99%) diff --git a/deps/rabbit/Makefile b/deps/rabbit/Makefile index a6b42dfc571d..df2c0a53aa9e 100644 --- a/deps/rabbit/Makefile +++ b/deps/rabbit/Makefile @@ -260,11 +260,11 @@ endef PARALLEL_CT_SET_1_A = unit_rabbit_ssl unit_cluster_formation_locking_mocks unit_cluster_formation_sort_nodes unit_collections unit_config_value_encryption unit_connection_tracking PARALLEL_CT_SET_1_B = amqp_address amqp_auth amqp_credit_api_v2 amqp_filtex amqp_dotnet amqp_jms signal_handling single_active_consumer unit_access_control_authn_authz_context_propagation unit_access_control_credential_validation unit_amqp091_content_framing unit_amqp091_server_properties unit_app_management PARALLEL_CT_SET_1_C = amqp_proxy_protocol amqpl_consumer_ack amqpl_direct_reply_to backing_queue bindings rabbit_db_maintenance rabbit_db_msup rabbit_db_policy rabbit_db_queue rabbit_db_topic_exchange rabbit_direct_reply_to_prop cluster_limit cluster_minority term_to_binary_compat_prop topic_permission transactions unicode unit_access_control -PARALLEL_CT_SET_1_D = amqqueue_backward_compatibility channel_interceptor channel_operation_timeout classic_queue classic_queue_prop config_schema peer_discovery_dns peer_discovery_tmp_hidden_node per_node_limit per_user_connection_channel_limit +PARALLEL_CT_SET_1_D = amqqueue_backward_compatibility channel_interceptor channel_operation_timeout classic_queue classic_queue_prop config_schema peer_discovery_dns peer_discovery_tmp_hidden_node per_node_limit per_user_connection_channel_limit prevent_startup_if_node_was_reset PARALLEL_CT_SET_2_A = cluster confirms_rejects consumer_timeout rabbit_access_control rabbit_confirms rabbit_core_metrics_gc rabbit_cuttlefish rabbit_db_binding rabbit_db_exchange PARALLEL_CT_SET_2_B = clustering_recovery crashing_queues deprecated_features direct_exchange_routing_v2 disconnect_detected_during_alarm exchanges unit_gen_server2 -PARALLEL_CT_SET_2_C = disk_monitor dynamic_qq unit_disk_monitor unit_file_handle_cache unit_log_management unit_operator_policy node_initial_run +PARALLEL_CT_SET_2_C = disk_monitor dynamic_qq unit_disk_monitor unit_file_handle_cache unit_log_management unit_operator_policy prevent_startup_if_node_was_reset PARALLEL_CT_SET_2_D = queue_length_limits queue_parallel quorum_queue_member_reconciliation rabbit_fifo rabbit_fifo_dlx rabbit_stream_coordinator PARALLEL_CT_SET_3_A = definition_import per_user_connection_channel_limit_partitions per_vhost_connection_limit_partitions policy priority_queue_recovery rabbit_fifo_v0 rabbit_stream_sac_coordinator_v4 rabbit_stream_sac_coordinator unit_credit_flow unit_queue_consumers unit_queue_location unit_quorum_queue diff --git a/deps/rabbit/src/rabbit.erl b/deps/rabbit/src/rabbit.erl index ec3eecb1f6d2..f9e40979e5f8 100644 --- a/deps/rabbit/src/rabbit.erl +++ b/deps/rabbit/src/rabbit.erl @@ -199,8 +199,8 @@ {requires, [core_initialized]}, {enables, routing_ready}]}). --rabbit_boot_step({initial_run_check, - [{description, "check if this is the first time the node starts"}, +-rabbit_boot_step({prevent_startup_if_node_was_reset, + [{description, "prevents node boot if a previous startup marker exists but the database is not seeded (requires opt-in configuration in rabbitmq.conf)"}, {mfa, {?MODULE, prevent_startup_if_node_was_reset, []}}, {requires, recovery}, {enables, empty_db_check}]}). @@ -208,7 +208,7 @@ -rabbit_boot_step({empty_db_check, [{description, "empty DB check"}, {mfa, {?MODULE, maybe_insert_default_data, []}}, - {requires, initial_run_check}, + {requires, prevent_startup_if_node_was_reset}, {enables, routing_ready}]}). diff --git a/deps/rabbit/test/node_initial_run_SUITE.erl b/deps/rabbit/test/prevent_startup_if_node_was_reset_SUITE.erl similarity index 99% rename from deps/rabbit/test/node_initial_run_SUITE.erl rename to deps/rabbit/test/prevent_startup_if_node_was_reset_SUITE.erl index 627248252c46..144e794c5504 100644 --- a/deps/rabbit/test/node_initial_run_SUITE.erl +++ b/deps/rabbit/test/prevent_startup_if_node_was_reset_SUITE.erl @@ -9,7 +9,7 @@ %% This feature helps detect potential data loss scenarios by maintaining %% a marker file to track if a node has been initialized before. --module(node_initial_run_SUITE). +-module(prevent_startup_if_node_was_reset_SUITE). -include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). From 74c4ec83df75fad942204fe8747224ca2e56d3ab Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Wed, 25 Jun 2025 17:39:54 +0400 Subject: [PATCH 4/6] Don't list a test suite twice in parallel CT suite groups #14087 #14125 --- deps/rabbit/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/rabbit/Makefile b/deps/rabbit/Makefile index df2c0a53aa9e..5153918dd56f 100644 --- a/deps/rabbit/Makefile +++ b/deps/rabbit/Makefile @@ -260,7 +260,7 @@ endef PARALLEL_CT_SET_1_A = unit_rabbit_ssl unit_cluster_formation_locking_mocks unit_cluster_formation_sort_nodes unit_collections unit_config_value_encryption unit_connection_tracking PARALLEL_CT_SET_1_B = amqp_address amqp_auth amqp_credit_api_v2 amqp_filtex amqp_dotnet amqp_jms signal_handling single_active_consumer unit_access_control_authn_authz_context_propagation unit_access_control_credential_validation unit_amqp091_content_framing unit_amqp091_server_properties unit_app_management PARALLEL_CT_SET_1_C = amqp_proxy_protocol amqpl_consumer_ack amqpl_direct_reply_to backing_queue bindings rabbit_db_maintenance rabbit_db_msup rabbit_db_policy rabbit_db_queue rabbit_db_topic_exchange rabbit_direct_reply_to_prop cluster_limit cluster_minority term_to_binary_compat_prop topic_permission transactions unicode unit_access_control -PARALLEL_CT_SET_1_D = amqqueue_backward_compatibility channel_interceptor channel_operation_timeout classic_queue classic_queue_prop config_schema peer_discovery_dns peer_discovery_tmp_hidden_node per_node_limit per_user_connection_channel_limit prevent_startup_if_node_was_reset +PARALLEL_CT_SET_1_D = amqqueue_backward_compatibility channel_interceptor channel_operation_timeout classic_queue classic_queue_prop config_schema peer_discovery_dns peer_discovery_tmp_hidden_node per_node_limit per_user_connection_channel_limit PARALLEL_CT_SET_2_A = cluster confirms_rejects consumer_timeout rabbit_access_control rabbit_confirms rabbit_core_metrics_gc rabbit_cuttlefish rabbit_db_binding rabbit_db_exchange PARALLEL_CT_SET_2_B = clustering_recovery crashing_queues deprecated_features direct_exchange_routing_v2 disconnect_detected_during_alarm exchanges unit_gen_server2 From 7876b2df585bed79b65179e658c983a23aa7f80c Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Wed, 25 Jun 2025 17:41:18 +0400 Subject: [PATCH 5/6] Update ct.test.spec --- deps/rabbit/ct.test.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/rabbit/ct.test.spec b/deps/rabbit/ct.test.spec index b118b5dab3a5..312634e39367 100644 --- a/deps/rabbit/ct.test.spec +++ b/deps/rabbit/ct.test.spec @@ -43,7 +43,7 @@ , disk_monitor_SUITE , dynamic_qq_SUITE , exchanges_SUITE -, node_initial_run_SUITE +, prevent_startup_if_node_was_reset_SUITE , rabbit_stream_queue_SUITE ]}. From 6c27536777813fa7ad4fc723a75dc45d11b4a423 Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Wed, 25 Jun 2025 17:42:14 +0400 Subject: [PATCH 6/6] Wording --- deps/rabbit/src/rabbit.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/rabbit/src/rabbit.erl b/deps/rabbit/src/rabbit.erl index f9e40979e5f8..3657f60f05bd 100644 --- a/deps/rabbit/src/rabbit.erl +++ b/deps/rabbit/src/rabbit.erl @@ -200,7 +200,7 @@ {enables, routing_ready}]}). -rabbit_boot_step({prevent_startup_if_node_was_reset, - [{description, "prevents node boot if a previous startup marker exists but the database is not seeded (requires opt-in configuration in rabbitmq.conf)"}, + [{description, "prevents node boot if a prior boot marker file exists but the database is not seeded (requires opt-in configuration in rabbitmq.conf)"}, {mfa, {?MODULE, prevent_startup_if_node_was_reset, []}}, {requires, recovery}, {enables, empty_db_check}]}).