Skip to content

Fix mnesia deletion return value in recent history exchange cleanup (backport #10995) #10996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 14, 2024
Merged

Fix mnesia deletion return value in recent history exchange cleanup (backport #10995) #10996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0bdf70
recent history exchange: Fix mnesia deletion return value
the-mikedavis Apr 13, 2024
4115847
recent history exchange: Test plugin boot and cleanup steps
the-mikedavis Apr 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion deps/rabbitmq_recent_history_exchange/src/rabbit_db_rh_exchange.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,12 @@ delete() ->
}).

delete_in_mnesia() ->
mnesia:delete_table(?RH_TABLE).
case mnesia:delete_table(?RH_TABLE) of
{atomic, ok} ->
ok;
{aborted, Reason} ->
{error, Reason}
end.

delete_in_khepri() ->
rabbit_khepri:delete(khepri_recent_history_path()).
Expand Down
13 changes: 12 additions & 1 deletion deps/rabbitmq_recent_history_exchange/test/system_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ all_tests() ->
wrong_argument_type_test,
no_store_test,
e2e_test,
multinode_test
multinode_test,
lifecycle_test
].

%% -------------------------------------------------------------------
Expand Down Expand Up @@ -235,6 +236,16 @@ multinode_test(Config) ->
rabbit_ct_client_helpers:close_connection_and_channel(Conn2, Chan2),
ok.

lifecycle_test(Config) ->
%% Ensure that the boot and cleanup steps run as expected and return 'ok'.
ok = rabbit_ct_broker_helpers:rpc(
Config,
rabbit, stop_apps, [[rabbitmq_recent_history_exchange]]),
ok = rabbit_ct_broker_helpers:rpc(
Config,
rabbit, start_apps, [[rabbitmq_recent_history_exchange]]),
ok.

test0(Config, MakeMethod, MakeMsg, DeclareArgs, Queues, MsgCount, ExpectedCount) ->
Chan = rabbit_ct_client_helpers:open_channel(Config),
#'exchange.declare_ok'{} =
Expand Down