diff options
| author | Matthias Radestock <matthias@lshift.net> | 2010-05-06 06:22:20 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2010-05-06 06:22:20 +0100 |
| commit | 3946353d89493d26bddcef75a7c7008998529cce (patch) | |
| tree | fc17d5b67d9fc46ac8a6984e995c50bc3b287f21 | |
| parent | 417e3893b3b390001dd6f55e35f38ae85baff47f (diff) | |
| download | rabbitmq-server-git-3946353d89493d26bddcef75a7c7008998529cce.tar.gz | |
cosmetic
| -rw-r--r-- | src/rabbit_msg_store.erl | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl index 4411a9501a..4dc390f66c 100644 --- a/src/rabbit_msg_store.erl +++ b/src/rabbit_msg_store.erl @@ -540,7 +540,7 @@ init([Server, BaseDir, ClientRefs, {MsgRefDeltaGen, MsgRefDeltaGenInit}]) -> end, InitFile = 0, - {IndexRecovered, FileSummaryEts} = + {FileSummaryRecovered, FileSummaryEts} = recover_file_summary(AllCleanShutdown, Dir), DedupCacheEts = ets:new(rabbit_msg_store_dedup_cache, [set, public]), FileHandlesEts = ets:new(rabbit_msg_store_shared_file_handles, @@ -568,7 +568,8 @@ init([Server, BaseDir, ClientRefs, {MsgRefDeltaGen, MsgRefDeltaGenInit}]) -> successfully_recovered = AllCleanShutdown }, - ok = count_msg_refs(AllCleanShutdown, MsgRefDeltaGen, MsgRefDeltaGenInit, State), + ok = count_msg_refs(AllCleanShutdown, MsgRefDeltaGen, MsgRefDeltaGenInit, + State), FileNames = sort_file_names(filelib:wildcard("*" ++ ?FILE_EXTENSION, Dir)), TmpFileNames = @@ -579,7 +580,7 @@ init([Server, BaseDir, ClientRefs, {MsgRefDeltaGen, MsgRefDeltaGenInit}]) -> %% whole lot Files = [filename_to_num(FileName) || FileName <- FileNames], {Offset, State1 = #msstate { current_file = CurFile }} = - build_index(IndexRecovered, Files, State), + build_index(FileSummaryRecovered, Files, State), %% read is only needed so that we can seek {ok, CurHdl} = open_file(Dir, filenum_to_name(CurFile), @@ -856,8 +857,9 @@ read_message1(From, #msg_location { guid = Guid, ref_count = RefCount, %% can return [] if msg in file existed on startup case ets:lookup(CurFileCacheEts, Guid) of [] -> - ok = case {ok, Offset} >= - file_handle_cache:current_raw_offset(CurHdl) of + {ok, RawOffSet} = + file_handle_cache:current_raw_offset(CurHdl), + ok = case Offset >= RawOffSet of true -> file_handle_cache:flush(CurHdl); false -> ok end, |