Skip to content

Commit 44df4c4

Browse files
committed
reset
1 parent 7c0c1dd commit 44df4c4

File tree

3 files changed

+5
-0
lines changed

3 files changed

+5
-0
lines changed

deps/rabbit/src/rabbit_db.erl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ force_load_on_next_boot_using_mnesia() ->
201201
rabbit_mnesia:force_load_next_boot().
202202

203203
post_reset() ->
204+
clear_init_finished(),
204205
wipe_data_dir(),
205206
rabbit_feature_flags:reset(),
206207

@@ -226,6 +227,8 @@ wipe_data_dir() ->
226227
#{domain => ?RMQLOG_DOMAIN_DB}),
227228
ok = rabbit_file:recursive_delete(FilesToRemove),
228229
_ = file:delete(rabbit_guid:filename()),
230+
?assertEqual([], filelib:wildcard(Glob)),
231+
?assert(is_virgin_node()),
229232
ok.
230233

231234
%% -------------------------------------------------------------------

deps/rabbit/src/rabbit_khepri.erl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,7 @@ reset() ->
380380
ok = setup(),
381381
ThisNode = node(),
382382
rabbit_db_cluster:forget_member(ThisNode, false),
383+
khepri_cluster:reset(?RA_CLUSTER_NAME),
383384
ok = khepri:stop(?RA_CLUSTER_NAME),
384385
ok = ensure_ra_system_stopped(),
385386
ok.

deps/rabbit/src/rabbit_mnesia.erl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ reset_gracefully() ->
235235
%% node which is down.
236236
init_db_with_mnesia(AllNodes, node_type(), false, false, _Retry = false),
237237
check_reset_gracefully(),
238+
rabbit_db_cluster:forget_member(node(), false),
238239
leave_cluster(),
239240
rabbit_misc:ensure_ok(mnesia:delete_schema([node()]), cannot_delete_schema),
240241
wipe().

0 commit comments

Comments
 (0)