Skip to content

Commit e158a86

Browse files
Merge pull request #11066 from rabbitmq/rabbitmq-server-11047-ignore-ebusy
Ignore `ebusy` when deleting a directory
2 parents 6a3d8be + c9fcc4d commit e158a86

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

deps/rabbit/src/rabbit_file.erl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ recursive_delete1(Path) ->
258258
ok ->
259259
case prim_file:del_dir(Path) of
260260
ok -> ok;
261+
{error, ebusy} -> ok; %% Can't delete a mount point
261262
{error, Err} -> {error, {Path, Err}}
262263
end;
263264
{error, _Err} = Error ->

deps/rabbit/src/rabbit_mnesia.erl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,6 +1042,7 @@ mnesia_and_msg_store_files() ->
10421042
rabbit_node_monitor:coordination_filename(),
10431043
rabbit_node_monitor:stream_filename(),
10441044
rabbit_node_monitor:default_quorum_filename(),
1045+
rabbit_node_monitor:classic_filename(),
10451046
rabbit_node_monitor:quorum_filename(),
10461047
rabbit_feature_flags:enabled_feature_flags_list_file(),
10471048
rabbit_khepri:dir()],

deps/rabbit/src/rabbit_node_monitor.erl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
cluster_status_filename/0, coordination_filename/0,
1515
stream_filename/0,
1616
quorum_filename/0, default_quorum_filename/0,
17+
classic_filename/0,
1718
prepare_cluster_status_files/0,
1819
write_cluster_status/1, read_cluster_status/0,
1920
update_cluster_status/0, reset_cluster_status/0]).
@@ -83,6 +84,9 @@ quorum_filename() ->
8384
default_quorum_filename() ->
8485
filename:join(rabbit:data_dir(), "quorum").
8586

87+
classic_filename() ->
88+
filename:join(rabbit:data_dir(), "msg_stores").
89+
8690
-spec prepare_cluster_status_files() -> 'ok' | no_return().
8791

8892
prepare_cluster_status_files() ->

0 commit comments

Comments
 (0)