Skip to content

Commit f4d75ae

Browse files
committed
clustering_management_SUITE: Reorganize the cluster_status/1 code
[Why] We want the code to depend less on Mnesia (and not at all in the future). We also want to make room to introduce the use of Khepri. [How] For now, we simply store each list in a variable. This give them a name to better understand what each one is. `rabbit_mnsia:cluster_nodes(all)` is also replaced by `rabbit_db_cluster:members()`. The other two calls to `rabbit_mnesia` are left alone as they are quite specific to Mnesia.
1 parent 15f208e commit f4d75ae

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

deps/rabbit/test/clustering_management_SUITE.erl

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -752,11 +752,18 @@ equal(Status0, Status1) ->
752752
Status0 == Status1.
753753

754754
cluster_status(Node) ->
755-
{rpc:call(Node, rabbit_nodes, list_members, []),
756-
rpc:call(Node, rabbit_nodes, list_running, []),
757-
rpc:call(Node, rabbit_mnesia, cluster_nodes, [all]),
758-
rpc:call(Node, rabbit_mnesia, cluster_nodes, [disc]),
759-
rpc:call(Node, rabbit_mnesia, cluster_nodes, [running])}.
755+
AllMembers = rpc:call(Node, rabbit_nodes, list_members, []),
756+
RunningMembers = rpc:call(Node, rabbit_nodes, list_running, []),
757+
758+
AllDbNodes = rpc:call(Node, rabbit_db_cluster, members, []),
759+
DiscDbNodes = rpc:call(Node, rabbit_mnesia, cluster_nodes, [disc]),
760+
RunningDbNodes = rpc:call(Node, rabbit_mnesia, cluster_nodes, [running]),
761+
762+
{AllMembers,
763+
RunningMembers,
764+
AllDbNodes,
765+
DiscDbNodes,
766+
RunningDbNodes}.
760767

761768
sort_cluster_status({{badrpc, {'EXIT', {undef, _}}}, {badrpc, {'EXIT', {undef, _}}}, AllM, DiscM, RunningM}) ->
762769
{undef, undef, lists:sort(AllM), lists:sort(DiscM), lists:sort(RunningM)};

0 commit comments

Comments
 (0)