wip

Author: dumbbell

deps/rabbitmq_ct_helpers/src/rabbit_ct_broker_helpers.erl

@@ -646,29 +646,29 @@ write_config_file(Config, NodeConfig, _I) ->
 
 -define(REQUIRED_FEATURE_FLAGS, [
     %% Required in 3.11:
-    "virtual_host_metadata,"
-    "quorum_queue,"
-    "implicit_default_bindings,"
-    "maintenance_mode_status,"
-    "user_limits,"
+    virtual_host_metadata,
+    quorum_queue,
+    implicit_default_bindings,
+    maintenance_mode_status,
+    user_limits,
     %% Required in 3.12:
-    "stream_queue,"
-    "classic_queue_type_delivery_support,"
-    "tracking_records_in_ets,"
-    "stream_single_active_consumer,"
-    "listener_records_in_ets,"
-    "feature_flags_v2,"
-    "direct_exchange_routing_v2,"
-    "classic_mirrored_queue_version," %% @todo Missing in FF docs!!
+    stream_queue,
+    classic_queue_type_delivery_support,
+    tracking_records_in_ets,
+    stream_single_active_consumer,
+    listener_records_in_ets,
+    feature_flags_v2,
+    direct_exchange_routing_v2,
+    classic_mirrored_queue_version, %% @todo Missing in FF docs!!
     %% Required in 3.12 in rabbitmq_management_agent:
-%    "drop_unroutable_metric,"
-%    "empty_basic_get_metric,"
+%    drop_unroutable_metric,
+%    empty_basic_get_metric,
     %% Required in 4.0:
-    "stream_sac_coordinator_unblock_group,"
-    "restart_streams,"
-    "stream_update_config_command,"
-    "stream_filtering,"
-    "message_containers" %% @todo Update FF docs!! It *is* required.
+    stream_sac_coordinator_unblock_group,
+    restart_streams,
+    stream_update_config_command,
+    stream_filtering,
+    message_containers %% @todo Update FF docs!! It *is* required.
 ]).
 
 do_start_rabbitmq_node(Config, NodeConfig, I) ->
@@ -795,13 +795,17 @@ do_start_rabbitmq_node(Config, NodeConfig, I) ->
                                     {_, undefined, SrcPlugin} -> SrcPlugin;
                                     {_, SecondaryEnabledPlugins0, _} -> SecondaryEnabledPlugins0
                                 end,
+                                RequiredFeatureFlags = string:join(
+                                                         [atom_to_list(F) ||
+                                                          F <- ?REQUIRED_FEATURE_FLAGS],
+                                                         ","),
                                 [{"DIST_DIR=~ts/plugins", [SecondaryDist]},
                                  {"CLI_SCRIPTS_DIR=~ts/sbin", [SecondaryDist]},
                                  {"CLI_ESCRIPTS_DIR=~ts/escript", [SecondaryDist]},
                                  {"RABBITMQ_SCRIPTS_DIR=~ts/sbin", [SecondaryDist]},
                                  {"RABBITMQ_SERVER=~ts/sbin/rabbitmq-server", [SecondaryDist]},
                                  {"RABBITMQ_ENABLED_PLUGINS=~ts", [SecondaryEnabledPlugins]},
-                                 {"RABBITMQ_FEATURE_FLAGS=~ts", [?REQUIRED_FEATURE_FLAGS]}
+                                 {"RABBITMQ_FEATURE_FLAGS=~ts", [RequiredFeatureFlags]}
                                 | ExtraArgs4];
                             false ->
                                 ExtraArgs4
@@ -901,18 +905,9 @@ query_node(Config, NodeConfig) ->
 
 uses_expected_metadata_store(Config, NodeConfig) ->
     %% We want to verify if the active metadata store matches the expected one.
-    %%
-    %% Before that, we may need to enable `khepri_db' on the node because if it
-    %% doesn't support the relative forced feature flags mechanism, it will
-    %% ignore the setting from `configure_metadata_store/1'. In this case, we
-    %% have to enable it at runtime.
     Nodename = ?config(nodename, NodeConfig),
     ExpectedMetadataStore = rabbit_ct_helpers:get_config(
                               Config, metadata_store),
-    case ExpectedMetadataStore of
-        mnesia -> ok;
-        khepri -> maybe_enable_khepri_as_expected(Config, Nodename)
-    end,
     IsKhepriEnabled = rpc(Config, Nodename, rabbit_khepri, is_enabled, []),
     UsedMetadataStore = case IsKhepriEnabled of
                             true  -> khepri;
@@ -923,43 +918,6 @@ uses_expected_metadata_store(Config, NodeConfig) ->
       [Nodename, UsedMetadataStore, ExpectedMetadataStore]),
     {ExpectedMetadataStore, UsedMetadataStore}.
 
-maybe_enable_khepri_as_expected(Config, Nodename) ->
-    %% We detect if the remote node supports the relative forced feature flags
-    %% mechanism by checking if `rabbit_feature_flags:get_require_level/1' is
-    %% exported. This is unrelated to the mechanism but it was committed around
-    %% the same time and was not backported either.
-    RelativeForcedFeatureFlagsUnsupported = (
-      rpc(Config, Nodename,
-          erlang, function_exported,
-          [rabbit_feature_flags, get_require_level, 1])
-     ),
-    case RelativeForcedFeatureFlagsUnsupported of
-        true ->
-            ok;
-        false ->
-            ct:pal(
-              "Relative forced feature flags unsupported on ~s, "
-              "enable Khepri now to enable expected metadata store",
-              [Nodename]),
-            Ret = enable_feature_flag(Config, [Nodename], khepri_db),
-            case Ret of
-                ok ->
-                    ok;
-                {error, missing_clustered_nodes} ->
-                    ct:pal(
-                      "Tried to enable Khepri on ~s as expected, but node "
-                      "not ready; retrying in 1 second",
-                      [Nodename]),
-                    timer:sleep(1000),
-                    maybe_enable_khepri_as_expected(Config, Nodename);
-                _ ->
-                    ct:pal(
-                      "Tried to enable Khepri on ~s as expected: ~0p",
-                      [Nodename, Ret]),
-                    ok
-            end
-    end.
-
 maybe_cluster_nodes(Config) ->
     Clustered0 = rabbit_ct_helpers:get_config(Config, rmq_nodes_clustered),
     Clustered = case Clustered0 of
@@ -1109,7 +1067,7 @@ configure_metadata_store(Config) ->
                       Config1,
                       {rabbit,
                        [{forced_feature_flags_on_init,
-                         {rel, [khepri_db], []}}]});
+                         [khepri_db | ?REQUIRED_FEATURE_FLAGS]}]});
                 _ ->
                     rabbit_ct_helpers:merge_app_env(
                       Config1,
@@ -1125,7 +1083,7 @@ configure_metadata_store(Config) ->
                       Config1,
                       {rabbit,
                        [{forced_feature_flags_on_init,
-                         {rel, [], [khepri_db]}}]});
+                         ?REQUIRED_FEATURE_FLAGS}]});
                 _ ->
                     rabbit_ct_helpers:merge_app_env(
                       Config1,