diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2010-08-15 17:01:22 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2010-08-15 17:01:22 +0100 |
| commit | ea9dff3ae339c17d84665d87ca23e3845545e7c3 (patch) | |
| tree | 7a49cf12345efd28c4b0a38887f17ef995efff7d | |
| parent | 8c1c34eb46a810ea7ffc7e7a2ecc6126777ffdc0 (diff) | |
| download | rabbitmq-server-ea9dff3ae339c17d84665d87ca23e3845545e7c3.tar.gz | |
don't attempt to recover file summary when we know there isn't one
| -rw-r--r-- | src/rabbit_msg_store.erl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl index 74c23f1e..1acc79d0 100644 --- a/src/rabbit_msg_store.erl +++ b/src/rabbit_msg_store.erl @@ -506,7 +506,7 @@ init([Server, BaseDir, ClientRefs, StartupFunState]) -> {ok, IndexModule} = application:get_env(msg_store_index_module), rabbit_log:info("~w: using ~p to provide index~n", [Server, IndexModule]), - FoundCrashedCompactions = + AttemptFileSummaryRecovery = case ClientRefs of undefined -> ok = rabbit_misc:recursive_delete([Dir]), ok = filelib:ensure_dir(filename:join(Dir, "nothing")), @@ -519,8 +519,7 @@ init([Server, BaseDir, ClientRefs, StartupFunState]) -> %% file_summary nor the location index. Note the file_summary is %% left empty here if it can't be recovered. {FileSummaryRecovered, FileSummaryEts} = - recover_file_summary(not FoundCrashedCompactions, Dir, Server), - %% FileSummaryRecovered => not FoundCrashedCompactions + recover_file_summary(AttemptFileSummaryRecovery, Dir, Server), {CleanShutdown, IndexState, ClientRefs1} = recover_index_and_client_refs(IndexModule, FileSummaryRecovered, @@ -1239,7 +1238,7 @@ recover_crashed_compactions(Dir) -> ok = recover_crashed_compaction( Dir, TmpFileName, NonTmpRelatedFileName) end, TmpFileNames), - [] =/= TmpFileNames. + TmpFileNames == []. recover_crashed_compaction(Dir, TmpFileName, NonTmpRelatedFileName) -> %% Because a msg can legitimately appear multiple times in the |