Merge branch 'main' into eval_membership_stand_alone_process

Author: michaelklishin

.github/workflows/oci-base.yaml

@@ -36,9 +36,9 @@ jobs:
         id: authorized
         run: |
           if [ -n "${{ secrets.DOCKERHUB_USERNAME }}" ]; then
-            echo "::set-output name=PUSH::true"
+            echo "PUSH=true" >> $GITHUB_OUTPUT
           else
-            echo "::set-output name=PUSH::false"
+            echo "PUSH=false" >> $GITHUB_OUTPUT
           fi
 
       - name: Login to DockerHub

.gitignore

@@ -86,6 +86,7 @@ rabbitmq-server-*.tar.xz
 rabbitmq-server-*.zip
 
 traces*
+deps/rabbitmq_stomp/test/python_SUITE_data/src/deps
 callgrand*
 
 /user.bazelrc

deps/rabbit/BUILD.bazel

@@ -386,7 +386,6 @@ rabbitmq_integration_suite(
     additional_beam = [
         ":test_quorum_queue_utils_beam",
     ],
-    flaky = True,
     shard_count = 7,
 )
 
@@ -562,7 +561,7 @@ rabbitmq_suite(
 
 rabbitmq_integration_suite(
     name = "peer_discovery_classic_config_SUITE",
-    size = "medium",
+    size = "large",
     flaky = True,
 )
 
@@ -574,7 +573,6 @@ rabbitmq_integration_suite(
 rabbitmq_integration_suite(
     name = "per_user_connection_channel_limit_partitions_SUITE",
     size = "large",
-    flaky = True,
 )
 
 rabbitmq_integration_suite(
@@ -1054,7 +1052,6 @@ rabbitmq_integration_suite(
     additional_beam = [
         "test/test_rabbit_event_handler.beam",
     ],
-    flaky = True,
 )
 
 rabbitmq_suite(

deps/rabbit/Makefile

@@ -149,7 +149,7 @@ TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client meck prop
 PLT_APPS += mnesia
 
 dep_syslog = git https://github.com/schlagert/syslog 4.0.0
-dep_osiris = git https://github.com/rabbitmq/osiris v1.6.0
+dep_osiris = git https://github.com/rabbitmq/osiris v1.6.1
 dep_systemd = hex 0.6.1
 dep_seshat = hex 0.4.0
 

deps/rabbit/app.bzl

@@ -884,7 +884,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         outs = ["test/definition_import_SUITE.beam"],
         app_name = "rabbit",
         erlc_opts = "//:test_erlc_opts",
-        deps = ["//deps/rabbit_common:erlang_app"],
+        deps = ["//deps/rabbit_common:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"],
     )
     erlang_bytecode(
         name = "deprecated_features_SUITE_beam_files",
@@ -936,7 +936,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         outs = ["test/dynamic_qq_SUITE.beam"],
         app_name = "rabbit",
         erlc_opts = "//:test_erlc_opts",
-        deps = ["//deps/amqp_client:erlang_app"],
+        deps = ["//deps/amqp_client:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"],
     )
     erlang_bytecode(
         name = "eager_sync_SUITE_beam_files",
@@ -1115,7 +1115,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         outs = ["test/per_user_connection_tracking_SUITE.beam"],
         app_name = "rabbit",
         erlc_opts = "//:test_erlc_opts",
-        deps = ["//deps/amqp_client:erlang_app"],
+        deps = ["//deps/amqp_client:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"],
     )
     erlang_bytecode(
         name = "per_vhost_connection_limit_SUITE_beam_files",
@@ -1151,7 +1151,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         outs = ["test/per_vhost_queue_limit_SUITE.beam"],
         app_name = "rabbit",
         erlc_opts = "//:test_erlc_opts",
-        deps = ["//deps/amqp_client:erlang_app"],
+        deps = ["//deps/amqp_client:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"],
     )
     erlang_bytecode(
         name = "policy_SUITE_beam_files",
@@ -1222,7 +1222,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         outs = ["test/queue_master_location_SUITE.beam"],
         app_name = "rabbit",
         erlc_opts = "//:test_erlc_opts",
-        deps = ["//deps/amqp_client:erlang_app"],
+        deps = ["//deps/amqp_client:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"],
     )
     erlang_bytecode(
         name = "queue_parallel_SUITE_beam_files",
@@ -1730,7 +1730,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         outs = ["test/unit_log_management_SUITE.beam"],
         app_name = "rabbit",
         erlc_opts = "//:test_erlc_opts",
-        deps = ["//deps/amqp_client:erlang_app"],
+        deps = ["//deps/amqp_client:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"],
     )
     erlang_bytecode(
         name = "unit_operator_policy_SUITE_beam_files",
@@ -1832,7 +1832,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         outs = ["test/vhost_SUITE.beam"],
         app_name = "rabbit",
         erlc_opts = "//:test_erlc_opts",
-        deps = ["//deps/amqp_client:erlang_app"],
+        deps = ["//deps/amqp_client:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"],
     )
     erlang_bytecode(
         name = "rabbit_cuttlefish_SUITE_beam_files",

deps/rabbit/src/rabbit_db.erl

@@ -42,12 +42,23 @@ init() ->
     ?LOG_DEBUG(
        "DB: this node is virgin: ~ts", [IsVirgin],
        #{domain => ?RMQLOG_DOMAIN_DB}),
+
     ensure_dir_exists(),
-    case init_using_mnesia() of
+    rabbit_peer_discovery:log_configured_backend(),
+    rabbit_peer_discovery:maybe_init(),
+
+    pre_init(IsVirgin),
+
+    Ret = run(
+            #{mnesia => fun init_using_mnesia/0}),
+    case Ret of
         ok ->
             ?LOG_DEBUG(
                "DB: initialization successeful",
                #{domain => ?RMQLOG_DOMAIN_DB}),
+
+            post_init(IsVirgin),
+
             ok;
         Error ->
             ?LOG_DEBUG(
@@ -56,6 +67,17 @@ init() ->
             Error
     end.
 
+pre_init(IsVirgin) ->
+    Members = rabbit_db_cluster:members(),
+    OtherMembers = rabbit_nodes:nodes_excl_me(Members),
+    rabbit_db_cluster:ensure_feature_flags_are_in_sync(OtherMembers, IsVirgin).
+
+post_init(false = _IsVirgin) ->
+    rabbit_peer_discovery:maybe_register();
+post_init(true = _IsVirgin) ->
+    %% Registration handled by rabbit_peer_discovery.
+    ok.
+
 init_using_mnesia() ->
     ?LOG_DEBUG(
       "DB: initialize Mnesia",
@@ -69,11 +91,12 @@ init_using_mnesia() ->
 %% @doc Resets the database and the node.
 
 reset() ->
-    reset_using_mnesia().
+    run(
+      #{mnesia => fun reset_using_mnesia/0}).
 
 reset_using_mnesia() ->
-    ?LOG_DEBUG(
-      "DB: resetting node",
+    ?LOG_INFO(
+      "DB: resetting node (using Mnesia)",
       #{domain => ?RMQLOG_DOMAIN_DB}),
     rabbit_mnesia:reset().
 
@@ -82,11 +105,12 @@ reset_using_mnesia() ->
 %% @doc Resets the database and the node.
 
 force_reset() ->
-    force_reset_using_mnesia().
+    run(
+      #{mnesia => fun force_reset_using_mnesia/0}).
 
 force_reset_using_mnesia() ->
     ?LOG_DEBUG(
-      "DB: resetting node forcefully",
+      "DB: resetting node forcefully (using Mnesia)",
       #{domain => ?RMQLOG_DOMAIN_DB}),
     rabbit_mnesia:force_reset().
 
@@ -98,11 +122,12 @@ force_reset_using_mnesia() ->
 %% state, like if critical members are MIA.
 
 force_load_on_next_boot() ->
-    force_load_on_next_boot_using_mnesia().
+    run(
+      #{mnesia => fun force_load_on_next_boot_using_mnesia/0}).
 
 force_load_on_next_boot_using_mnesia() ->
     ?LOG_DEBUG(
-      "DB: resetting node forcefully",
+      "DB: force load on next boot (using Mnesia)",
       #{domain => ?RMQLOG_DOMAIN_DB}),
     rabbit_mnesia:force_load_next_boot().
 
@@ -115,8 +140,11 @@ force_load_on_next_boot_using_mnesia() ->
 %% @see is_virgin_node/1.
 
 is_virgin_node() ->
-    ThisNode = node(),
-    is_virgin_node(ThisNode).
+    run(
+      #{mnesia => fun is_virgin_node_using_mnesia/0}).
+
+is_virgin_node_using_mnesia() ->
+    rabbit_mnesia:is_virgin_node().
 
 -spec is_virgin_node(Node) -> IsVirgin | undefined when
       Node :: node(),
@@ -129,14 +157,11 @@ is_virgin_node() ->
 %% @returns `true' if the node is virgin, `false' if it is not, or `undefined'
 %% if the given node is remote and we couldn't determine it.
 
+is_virgin_node(Node) when Node =:= node() ->
+    is_virgin_node();
 is_virgin_node(Node) when is_atom(Node) ->
-    is_virgin_node_with_mnesia(Node).
-
-is_virgin_node_with_mnesia(Node) when Node =:= node() ->
-    rabbit_mnesia:is_virgin_node();
-is_virgin_node_with_mnesia(Node) ->
     try
-        erpc:call(Node, rabbit_mnesia, is_virgin_node, [], ?TIMEOUT)
+        erpc:call(Node, ?MODULE, is_virgin_node, [], ?TIMEOUT)
     catch
         _:_ ->
             undefined
@@ -149,7 +174,8 @@ is_virgin_node_with_mnesia(Node) ->
 %% @returns the directory path.
 
 dir() ->
-    mnesia_dir().
+    run(
+      #{mnesia => fun mnesia_dir/0}).
 
 mnesia_dir() ->
     rabbit_mnesia:dir().
@@ -183,9 +209,9 @@ ensure_dir_exists() ->
 run(Funs)
   when is_map(Funs) andalso is_map_key(mnesia, Funs) ->
     #{mnesia := MnesiaFun} = Funs,
-    run_with_mnesia(MnesiaFun).
+    run_using_mnesia(MnesiaFun).
 
-run_with_mnesia(Fun) ->
+run_using_mnesia(Fun) ->
     Fun().
 
 list_in_mnesia(Table, Match) ->