Skip to content

Commit 7427cfe

Browse files
author
Loïc Hoguin
committed
CQ: Don't scan shared store files before deleting them
We assume that the message store's state is correct and no longer do this expensive assert.
1 parent 9fbc0fb commit 7427cfe

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

deps/rabbit/src/rabbit_msg_store.erl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1977,9 +1977,9 @@ truncate_file(File, Size, ThresholdTimestamp, #gc_state{ file_summary_ets = File
19771977

19781978
-spec delete_file(non_neg_integer(), gc_state()) -> ok | defer.
19791979

1980-
delete_file(File, State = #gc_state { file_summary_ets = FileSummaryEts,
1981-
file_handles_ets = FileHandlesEts,
1982-
dir = Dir }) ->
1980+
delete_file(File, #gc_state { file_summary_ets = FileSummaryEts,
1981+
file_handles_ets = FileHandlesEts,
1982+
dir = Dir }) ->
19831983
case ets:match_object(FileHandlesEts, {{'_', File}, '_'}, 1) of
19841984
{[_|_], _Cont} ->
19851985
rabbit_log:debug("Asked to delete file ~p but it has active readers. Deferring.",
@@ -1988,7 +1988,6 @@ delete_file(File, State = #gc_state { file_summary_ets = FileSummaryEts,
19881988
_ ->
19891989
[#file_summary{ valid_total_size = 0,
19901990
file_size = FileSize }] = ets:lookup(FileSummaryEts, File),
1991-
{[], 0} = scan_and_vacuum_message_file(File, State),
19921991
ok = file:delete(form_filename(Dir, filenum_to_name(File))),
19931992
true = ets:delete(FileSummaryEts, File),
19941993
rabbit_log:debug("Deleted empty file number ~tp; reclaimed ~tp bytes", [File, FileSize]),

0 commit comments

Comments
 (0)