summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2010-08-15 20:15:59 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2010-08-15 20:15:59 +0100
commit04cf4c3939db89eb8a4b52465dbc7520e9d4016a (patch)
treee00cca27aa00bf1d02fc5bba47b0d62357feeb0a
parentea9dff3ae339c17d84665d87ca23e3845545e7c3 (diff)
downloadrabbitmq-server-04cf4c3939db89eb8a4b52465dbc7520e9d4016a.tar.gz
don't log file summary recover error
the details aren't that important and get in the way of a fresh startup
-rw-r--r--src/rabbit_msg_store.erl13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl
index 1acc79d0..4600efc1 100644
--- a/src/rabbit_msg_store.erl
+++ b/src/rabbit_msg_store.erl
@@ -519,7 +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(AttemptFileSummaryRecovery, Dir, Server),
+ recover_file_summary(AttemptFileSummaryRecovery, Dir),
{CleanShutdown, IndexState, ClientRefs1} =
recover_index_and_client_refs(IndexModule, FileSummaryRecovered,
@@ -1181,7 +1181,7 @@ store_file_summary(Tid, Dir) ->
ok = ets:tab2file(Tid, filename:join(Dir, ?FILE_SUMMARY_FILENAME),
[{extended_info, [object_count]}]).
-recover_file_summary(false, _Dir, _Server) ->
+recover_file_summary(false, _Dir) ->
%% TODO: the only reason for this to be an *ordered*_set is so
%% that a) maybe_compact can start a traversal from the eldest
%% file, and b) build_index in fast recovery mode can easily
@@ -1191,15 +1191,12 @@ recover_file_summary(false, _Dir, _Server) ->
%% ditching the latter would be neater.
{false, ets:new(rabbit_msg_store_file_summary,
[ordered_set, public, {keypos, #file_summary.file}])};
-recover_file_summary(true, Dir, Server) ->
+recover_file_summary(true, Dir) ->
Path = filename:join(Dir, ?FILE_SUMMARY_FILENAME),
case ets:file2tab(Path) of
- {ok, Tid} -> file:delete(Path),
+ {ok, Tid} -> file:delete(Path),
{true, Tid};
- {error, Error} -> rabbit_log:warning(
- "~w: failed to recover file summary: ~p~n",
- [Server, Error]),
- recover_file_summary(false, Dir, Server)
+ {error, _Error} -> recover_file_summary(false, Dir)
end.
count_msg_refs(Gen, Seed, State) ->