Skip to content

Commit ad2354b

Browse files
authored
Merge pull request #12799 from rabbitmq/stop-vhos-reconciliation-if-rabbit-is-stopped
rabbit_vhosts: Don't reconcile vhosts if `rabbit` is stopped
2 parents 66fd179 + fe2061b commit ad2354b

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

deps/rabbit/src/rabbit_vhosts.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ boot() ->
5151
%% See start_processes_for_all/1.
5252
-spec reconcile() -> 'ok'.
5353
reconcile() ->
54-
case is_reconciliation_enabled() of
54+
case rabbit:is_running() andalso is_reconciliation_enabled() of
5555
false -> ok;
5656
true ->
5757
_ = reconcile_once(),

deps/rabbit/test/quorum_queue_member_reconciliation_SUITE.erl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,10 @@ reset_nodes([], _Leader) ->
9191
ok;
9292
reset_nodes([Node| Nodes], Leader) ->
9393
ok = rabbit_control_helper:command(stop_app, Node),
94-
ok = rabbit_control_helper:command(forget_cluster_node, Leader, [atom_to_list(Node)]),
94+
case rabbit_control_helper:command(forget_cluster_node, Leader, [atom_to_list(Node)]) of
95+
ok -> ok;
96+
{error, _, <<"Error:\n{:not_a_cluster_node, ~c\"The node selected is not in the cluster.\"}">>} -> ok
97+
end,
9598
ok = rabbit_control_helper:command(reset, Node),
9699
ok = rabbit_control_helper:command(start_app, Node),
97100
reset_nodes(Nodes, Leader).

0 commit comments

Comments
 (0)