Skip to content

rabbit_vhosts: Don't reconcile vhosts if rabbit is stopped (backport #12799) #12800

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
Nov 25, 2024
Merged

rabbit_vhosts: Don't reconcile vhosts if rabbit is stopped (backport #12799) #12800

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
b61c598
rabbit_vhosts: Don't reconcile vhosts if `rabbit` is stopped
dumbbell Nov 22, 2024
acbc895
quorum_queue_member_reconciliation_SUITE: Improve `reset_nodes/2`
dumbbell Nov 22, 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
2 changes: 1 addition & 1 deletion deps/rabbit/src/rabbit_vhosts.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ boot() ->
%% See start_processes_for_all/1.
-spec reconcile() -> 'ok'.
reconcile() ->
case is_reconciliation_enabled() of
case rabbit:is_running() andalso is_reconciliation_enabled() of
false -> ok;
true ->
_ = reconcile_once(),
Expand Down
5 changes: 4 additions & 1 deletion deps/rabbit/test/quorum_queue_member_reconciliation_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,10 @@ reset_nodes([], _Leader) ->
ok;
reset_nodes([Node| Nodes], Leader) ->
ok = rabbit_control_helper:command(stop_app, Node),
ok = rabbit_control_helper:command(forget_cluster_node, Leader, [atom_to_list(Node)]),
case rabbit_control_helper:command(forget_cluster_node, Leader, [atom_to_list(Node)]) of
ok -> ok;
{error, _, <<"Error:\n{:not_a_cluster_node, ~c\"The node selected is not in the cluster.\"}">>} -> ok
end,
ok = rabbit_control_helper:command(reset, Node),
ok = rabbit_control_helper:command(start_app, Node),
reset_nodes(Nodes, Leader).
Expand Down
Loading