wip

Author: dumbbell

deps/rabbitmq_ct_helpers/src/rabbit_ct_broker_helpers.erl

@@ -795,17 +795,30 @@ do_start_rabbitmq_node(Config, NodeConfig, I) ->
                                     {_, undefined, SrcPlugin} -> SrcPlugin;
                                     {_, SecondaryEnabledPlugins0, _} -> SecondaryEnabledPlugins0
                                 end,
-                                RequiredFeatureFlags = string:join(
-                                                         [atom_to_list(F) ||
-                                                          F <- ?REQUIRED_FEATURE_FLAGS],
-                                                         ","),
+                                %% TODO: When we start to do mixed-version
+                                %% testing against 4.1.x as the secondary
+                                %% umbrella, we will need to stop setting
+                                %% `$RABBITMQ_FEATURE_FLAGS'.
+                                MetadataStore = rabbit_ct_helpers:get_config(
+                                                  Config, metadata_store),
+                                FeatureFlags = case MetadataStore of
+                                                   mnesia ->
+                                                       ?REQUIRED_FEATURE_FLAGS;
+                                                   khepri ->
+                                                       [khepri_db |
+                                                        ?REQUIRED_FEATURE_FLAGS]
+                                               end,
+                                FeatureFlags1 = string:join(
+                                                  [atom_to_list(F) ||
+                                                   F <- FeatureFlags],
+                                                  ","),
                                 [{"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", [RequiredFeatureFlags]}
+                                 {"RABBITMQ_FEATURE_FLAGS=~ts", [FeatureFlags1]}
                                 | ExtraArgs4];
                             false ->
                                 ExtraArgs4
@@ -1058,6 +1071,14 @@ configure_metadata_store(Config) ->
     %% However, RabbitMQ 4.0.x and older don't support it. See the
     %% `uses_expected_metadata_store/2' check to see how Khepri is enabled in
     %% this case.
+    %%
+    %% Note that this setting will be ignored by the secondary umbrella because
+    %% we set `$RABBITMQ_FEATURE_FLAGS' explisitly. In this case, we handle the
+    %% `khepri_db' feature flag when we compute the value of that variable.
+    %%
+    %% TODO: When we start to do mixed-version testing against 4.1.x as the
+    %% secondary umbrella, we will need to stop setting
+    %% `$RABBITMQ_FEATURE_FLAGS'.
     case MetadataStore of
         khepri ->
             ct:log("Enabling Khepri metadata store"),
@@ -1067,7 +1088,7 @@ configure_metadata_store(Config) ->
                       Config1,
                       {rabbit,
                        [{forced_feature_flags_on_init,
-                         [khepri_db | ?REQUIRED_FEATURE_FLAGS]}]});
+                         {rel, [khepri_db], []}}]});
                 _ ->
                     rabbit_ct_helpers:merge_app_env(
                       Config1,
@@ -1083,7 +1104,7 @@ configure_metadata_store(Config) ->
                       Config1,
                       {rabbit,
                        [{forced_feature_flags_on_init,
-                         ?REQUIRED_FEATURE_FLAGS}]});
+                         {rel, [], [khepri_db]}}]});
                 _ ->
                     rabbit_ct_helpers:merge_app_env(
                       Config1,