Scan the file and remove from the index as necessary on file delete rather than index_delete_by_file

1 files changed, 4 insertions, 1 deletions

diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl
index 337f04ab62..f9345c0b33 100644
--- a/src/rabbit_msg_store.erl
+++ b/src/rabbit_msg_store.erl
@@ -1535,7 +1535,10 @@ delete_file_if_empty(File, State = #msstate {
              end,
              true = mark_handle_to_close(FileHandlesEts, File),
              true = ets:delete(FileSummaryEts, File),
-             ok = index_delete_by_file(File, State),
+             {ok, Messages, FileSize} =
+                 scan_file_for_valid_messages(Dir, filenum_to_name(File)),
+             [index_delete(Guid, State) ||
+                 {Guid, _TotalSize, _Offset} <- Messages],
              State1 = close_handle(File, State),
              ok = file:delete(form_filename(Dir, filenum_to_name(File))),
              State1 #msstate { sum_file_size = SumFileSize - FileSize };