summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2010-08-15 14:49:47 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2010-08-15 14:49:47 +0100
commit79a7a99c45e17409c9f7c6ffdda20e0ef5170a47 (patch)
treeb27244af44f295053ac91b62b254c3c021e3f378
parentca067635b60d1f8d4daa96b31a65dc38c173d318 (diff)
downloadrabbitmq-server-git-79a7a99c45e17409c9f7c6ffdda20e0ef5170a47.tar.gz
minor refactor
-rw-r--r--src/rabbit_msg_store.erl6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl
index 242c1fb8b7..10a64f9ab3 100644
--- a/src/rabbit_msg_store.erl
+++ b/src/rabbit_msg_store.erl
@@ -516,6 +516,8 @@ init([Server, BaseDir, ClientRefs, {MsgRefDeltaGen, MsgRefDeltaGenInit}]) ->
recover_crashed_compactions(Dir, FileNames, TmpFileNames)
end,
+ FoundCrashedCompactions = recover_crashed_compactions(Dir),
+
%% if we found crashed compactions we trust neither the
%% file_summary nor the location index. Note the file_summary is
%% left empty here if it can't be recovered.
@@ -1248,7 +1250,9 @@ count_msg_refs(Gen, Seed, State) ->
count_msg_refs(Gen, Next, State)
end.
-recover_crashed_compactions(Dir, FileNames, TmpFileNames) ->
+recover_crashed_compactions(Dir) ->
+ FileNames = list_sorted_file_names(Dir, ?FILE_EXTENSION),
+ TmpFileNames = list_sorted_file_names(Dir, ?FILE_EXTENSION_TMP),
lists:foreach(
fun (TmpFileName) ->
NonTmpRelatedFileName =