Skip to content

Commit 7d5d790

Browse files
committed
rabbitmq_ct_helpers: Change how Mnesia/Khepri is selected
[Why] With `khepr_db` enabled by default, we need another way to disable it to select Mnesia instead. [How] For Khepri, we force the `khepri_db` feature flag. For Mnesia, we force an empty list, meaning all stable feature flags are disabled by default. Testsuites will have to enable whatever feature flags they need, though they should already do that. While here, change `rjms_topic_selector_SUITE` to only choose Khepri without specifying any feature flags.
1 parent a56c0bd commit 7d5d790

File tree

2 files changed

+17
-37
lines changed

2 files changed

+17
-37
lines changed

deps/rabbitmq_ct_helpers/src/rabbit_ct_broker_helpers.erl

Lines changed: 16 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -215,19 +215,19 @@ setup_steps() ->
215215
fun rabbit_ct_helpers:ensure_rabbitmqctl_app/1,
216216
fun rabbit_ct_helpers:ensure_rabbitmq_plugins_cmd/1,
217217
fun set_lager_flood_limit/1,
218+
fun configure_metadata_store/1,
218219
fun start_rabbitmq_nodes/1,
219-
fun share_dist_and_proxy_ports_map/1,
220-
fun configure_metadata_store/1
220+
fun share_dist_and_proxy_ports_map/1
221221
];
222222
_ ->
223223
[
224224
fun rabbit_ct_helpers:ensure_rabbitmqctl_cmd/1,
225225
fun rabbit_ct_helpers:load_rabbitmqctl_app/1,
226226
fun rabbit_ct_helpers:ensure_rabbitmq_plugins_cmd/1,
227227
fun set_lager_flood_limit/1,
228+
fun configure_metadata_store/1,
228229
fun start_rabbitmq_nodes/1,
229-
fun share_dist_and_proxy_ports_map/1,
230-
fun configure_metadata_store/1
230+
fun share_dist_and_proxy_ports_map/1
231231
]
232232
end.
233233

@@ -999,57 +999,37 @@ share_dist_and_proxy_ports_map(Config) ->
999999
configured_metadata_store(Config) ->
10001000
case rabbit_ct_helpers:get_config(Config, metadata_store) of
10011001
khepri ->
1002-
{khepri, []};
1003-
{khepri, _FFs0} = Khepri ->
1004-
Khepri;
1002+
khepri;
10051003
mnesia ->
10061004
mnesia;
10071005
_ ->
10081006
case os:getenv("RABBITMQ_METADATA_STORE") of
1009-
"khepri" ->
1010-
{khepri, []};
1011-
_ ->
1012-
mnesia
1007+
"khepri" -> khepri;
1008+
_ -> mnesia
10131009
end
10141010
end.
10151011

10161012
configure_metadata_store(Config) ->
10171013
ct:log("Configuring metadata store..."),
10181014
case configured_metadata_store(Config) of
1019-
{khepri, FFs0} ->
1020-
case enable_khepri_metadata_store(Config, FFs0) of
1021-
{skip, _} = Skip ->
1022-
_ = stop_rabbitmq_nodes(Config),
1023-
Skip;
1024-
Config1 ->
1025-
Config1
1026-
end;
1015+
khepri ->
1016+
ct:log("Enabling Khepri metadata store"),
1017+
rabbit_ct_helpers:merge_app_env(
1018+
Config,
1019+
{rabbit, [{forced_feature_flags_on_init, [khepri_db]}]});
10271020
mnesia ->
10281021
ct:log("Enabling Mnesia metadata store"),
1029-
Config
1022+
rabbit_ct_helpers:merge_app_env(
1023+
Config,
1024+
{rabbit, [{forced_feature_flags_on_init, []}]})
10301025
end.
10311026

1032-
enable_khepri_metadata_store(Config, FFs0) ->
1033-
ct:log("Enabling Khepri metadata store"),
1034-
FFs = [khepri_db | FFs0],
1035-
lists:foldl(fun(_FF, {skip, _Reason} = Skip) ->
1036-
Skip;
1037-
(FF, C) ->
1038-
case enable_feature_flag(C, FF) of
1039-
ok ->
1040-
C;
1041-
{skip, _} = Skip ->
1042-
ct:pal("Enabling metadata store failed: ~p", [Skip]),
1043-
Skip
1044-
end
1045-
end, Config, FFs).
1046-
10471027
%% Waits until the metadata store replica on Node is up to date with the leader.
10481028
await_metadata_store_consistent(Config, Node) ->
10491029
case configured_metadata_store(Config) of
10501030
mnesia ->
10511031
ok;
1052-
{khepri, _} ->
1032+
khepri ->
10531033
RaClusterName = rabbit_khepri:get_ra_cluster_name(),
10541034
Leader = rpc(Config, Node, ra_leaderboard, lookup_leader, [RaClusterName]),
10551035
LastAppliedLeader = ra_last_applied(Leader),

deps/rabbitmq_jms_topic_exchange/test/rjms_topic_selector_SUITE.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ init_per_group(mnesia_store = Group, Config0) ->
5656
init_per_group(khepri_store = Group, Config0) ->
5757
Config = rabbit_ct_helpers:set_config(
5858
Config0,
59-
[{metadata_store, {khepri, [khepri_db]}}]),
59+
[{metadata_store, khepri}]),
6060
init_per_group_common(Group, Config);
6161
init_per_group(khepri_migration = Group, Config0) ->
6262
Config = rabbit_ct_helpers:set_config(Config0, [{metadata_store, mnesia}]),

0 commit comments

Comments
 (0)