Skip to content

Commit 3a72dda

Browse files
mkuratczykmergify[bot]
authored andcommitted
Ignore ebusy when deleting a folder
A folder can be a mount point and the kernel won't allow deleting a mount point - it will return ebusy We don't need to check for ebusy when deleting a file (cherry picked from commit c1db65f)
1 parent dccba70 commit 3a72dda

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

deps/rabbit/src/rabbit_file.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,6 @@ recursive_delete1(Path) ->
244244
false -> case prim_file:delete(Path) of
245245
ok -> ok;
246246
{error, enoent} -> ok; %% Path doesn't exist anyway
247-
{error, ebusy} -> ok; %% Ignore (rabbitmq/rabbitmq-server#11047)
248247
{error, Err} -> {error, {Path, Err}}
249248
end;
250249
true -> case prim_file:list_dir(Path) of
@@ -259,6 +258,7 @@ recursive_delete1(Path) ->
259258
ok ->
260259
case prim_file:del_dir(Path) of
261260
ok -> ok;
261+
{error, ebusy} -> ok; %% Can't delete a mount point
262262
{error, Err} -> {error, {Path, Err}}
263263
end;
264264
{error, _Err} = Error ->

0 commit comments

Comments
 (0)