diff options
Diffstat (limited to 'deps/rabbit/src/rabbit_khepri.erl')
| -rw-r--r-- | deps/rabbit/src/rabbit_khepri.erl | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/deps/rabbit/src/rabbit_khepri.erl b/deps/rabbit/src/rabbit_khepri.erl index ae5d9c920d..91f3d5b441 100644 --- a/deps/rabbit/src/rabbit_khepri.erl +++ b/deps/rabbit/src/rabbit_khepri.erl @@ -86,6 +86,8 @@ -export([if_has_data/1, if_has_data_wildcard/0]). +-export([force_shrink_member_to_current_member/0]). + -ifdef(TEST). -export([force_metadata_store/1, clear_forced_metadata_store/0]). @@ -372,6 +374,10 @@ force_reset() -> DataDir = maps:get(data_dir, ra_system:fetch(coordination)), ok = rabbit_file:recursive_delete(filelib:wildcard(DataDir ++ "/*")). +force_shrink_member_to_current_member() -> + ok = ra_server_proc:force_shrink_members_to_current_member( + {?RA_CLUSTER_NAME, node()}). + ensure_ra_system_started() -> {ok, _} = application:ensure_all_started(khepri), ok = rabbit_ra_systems:ensure_ra_system_started(?RA_SYSTEM). @@ -466,9 +472,9 @@ get_sys_status(Proc) -> cli_cluster_status() -> case rabbit:is_running() of true -> - Nodes = nodes(), - [{nodes, [{disc, [N || N <- Nodes, rabbit_nodes:is_running(N)]}]}, - {running_nodes, Nodes}, + Nodes = locally_known_nodes(), + [{nodes, [{disc, Nodes}]}, + {running_nodes, [N || N <- Nodes, rabbit_nodes:is_running(N)]}, {cluster_name, rabbit_nodes:cluster_name()}]; false -> [] @@ -492,6 +498,9 @@ init_cluster() -> _ = application:ensure_all_started(khepri_mnesia_migration), rabbit_log:debug("Khepri clustering: syncing cluster membership"), mnesia_to_khepri:sync_cluster_membership(?STORE_ID) + catch + error:{khepri_mnesia_migration_ex, _, _} = Reason -> + {error, Reason} after case IsRunning of true -> ok; |