ct

Author: dumbbell

deps/rabbitmq_ct_helpers/src/rabbit_ct_broker_helpers.erl

@@ -905,6 +905,25 @@ query_node(Config, NodeConfig) ->
     rabbit_ct_helpers:set_config(NodeConfig, Vars).
 
 uses_expected_metadata_store(Config, NodeConfig) ->
+    case ?config(use_secondary_umbrella, NodeConfig) of
+        false ->
+            does_use_expected_metadata_store(Config, NodeConfig);
+        true ->
+            ExpectedMetadataStore = rabbit_ct_helpers:get_config(
+                                      Config, metadata_store),
+            case does_use_expected_metadata_store(Config, NodeConfig) of
+                {MetadataStore, MetadataStore} = Ret ->
+                    Ret;
+                _ when ExpectedMetadataStore =:= khepri ->
+                    Nodename = ?config(nodename, NodeConfig),
+                    _ = rpc(Config, Nodename, rabbit_feature_flags, enable, [khepri_db]),
+                    does_use_expected_metadata_store(Config, NodeConfig);
+                Ret ->
+                    Ret
+            end
+    end.
+
+does_use_expected_metadata_store(Config, NodeConfig) ->
     %% We want to verify if the active metadata store matches the expected one.
     Nodename = ?config(nodename, NodeConfig),
     ExpectedMetadataStore = rabbit_ct_helpers:get_config(
@@ -916,7 +935,7 @@ uses_expected_metadata_store(Config, NodeConfig) ->
                         end,
     ct:pal(
       "Metadata store on ~s: expected=~s, used=~s",
-      [Nodename, UsedMetadataStore, ExpectedMetadataStore]),
+      [Nodename, ExpectedMetadataStore, UsedMetadataStore]),
     {ExpectedMetadataStore, UsedMetadataStore}.
 
 maybe_cluster_nodes(Config) ->
@@ -1088,14 +1107,6 @@ 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"),