yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(fs-gc): make deletion empty transfer directories safer

This commit is contained in:
Andrew Mayorov 2023-03-03 18:02:19 +03:00 committed by Ilya Averyanov
parent 344799f100
commit bcd2099ce1
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
apps/emqx_ft/src/emqx_ft_storage_fs_gc.erl
View File

@ -196,15 +196,18 @@ collect_outdated_tempfiles(Storage, Transfer, Cutoff, Stats) ->
collect_transfer_directory(Storage, Transfer, Stats) -> collect_transfer_directory(Storage, Transfer, Stats) ->
Dirname = emqx_ft_storage_fs:get_subdir(Storage, Transfer), Dirname = emqx_ft_storage_fs:get_subdir(Storage, Transfer),
StatsNext = collect_empty_directory(Dirname, Stats), StatsNext = collect_empty_directory(Dirname, Stats),
collect_parents(Dirname, StatsNext). collect_parents(Dirname, get_storage_root(Storage), StatsNext).
collect_parents(Dirname, Stats) -> collect_parents(Dirname, Until, Stats) ->
Parent = filename:dirname(Dirname), Parent = filename:dirname(Dirname),
case file:del_dir(Parent) of case is_same_filepath(Parent, Until) orelse file:del_dir(Parent) of
true ->
Stats;
ok -> ok ->
collect_parents(Parent, account_gcstat_directory(Stats)); ?tp(garbage_collected_directory, #{path => Dirname}),
collect_parents(Parent, Until, account_gcstat_directory(Stats));
{error, enoent} -> {error, enoent} ->
collect_parents(Parent, Stats); collect_parents(Parent, Until, Stats);
{error, eexist} -> {error, eexist} ->
Stats; Stats;
{error, Reason} -> {error, Reason} ->
@ -289,6 +292,16 @@ filter_filepath(Filter, _, _) when is_boolean(Filter) ->
filter_filepath(Filter, Filepath, Fileinfo) when is_function(Filter) -> filter_filepath(Filter, Filepath, Fileinfo) when is_function(Filter) ->
Filter(Filepath, Fileinfo). Filter(Filepath, Fileinfo).
is_same_filepath(P1, P2) when is_binary(P1) andalso is_binary(P2) ->
filename:absname(P1) == filename:absname(P2);
is_same_filepath(P1, P2) when is_list(P1) andalso is_list(P2) ->
filename:absname(P1) == filename:absname(P2);
is_same_filepath(P1, P2) when is_binary(P1) ->
is_same_filepath(P1, filepath_to_binary(P2)).
filepath_to_binary(S) ->
unicode:characters_to_binary(S, unicode, file:native_name_encoding()).
get_segments_ttl(Storage, Transfer) -> get_segments_ttl(Storage, Transfer) ->
{MinTTL, MaxTTL} = emqx_ft_conf:segments_ttl(Storage), {MinTTL, MaxTTL} = emqx_ft_conf:segments_ttl(Storage),
clamp(MinTTL, MaxTTL, try_get_filemeta_ttl(Storage, Transfer)). clamp(MinTTL, MaxTTL, try_get_filemeta_ttl(Storage, Transfer)).