diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2011-10-15 12:46:34 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2011-10-15 12:46:34 +0100 |
| commit | f822f30aa86c1b5db76aca0cb5aed4d96486591b (patch) | |
| tree | 4c8014b4a54d21f7e7f37863e78585436772f3ae | |
| parent | 751c3268c5f9e8353370abdc804108bdc80e4fc0 (diff) | |
| download | rabbitmq-server-f822f30aa86c1b5db76aca0cb5aed4d96486591b.tar.gz | |
rename 'removed' confirmation event name to 'ignored'
since that reflects its meaning better
| -rw-r--r-- | src/rabbit_msg_store.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_variable_queue.erl | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl index 1a26a200..a25245c9 100644 --- a/src/rabbit_msg_store.erl +++ b/src/rabbit_msg_store.erl @@ -136,7 +136,7 @@ fun ((A) -> 'finished' | {rabbit_types:msg_id(), non_neg_integer(), A})). -type(maybe_msg_id_fun() :: - 'undefined' | fun ((gb_set(), 'written' | 'removed') -> any())). + 'undefined' | fun ((gb_set(), 'written' | 'ignored') -> any())). -type(maybe_close_fds_fun() :: 'undefined' | fun (() -> 'ok')). -type(deletion_thunk() :: fun (() -> boolean())). @@ -800,7 +800,7 @@ handle_cast({write, CRef, MsgId}, %% A 'remove' has already been issued and eliminated the %% 'write'. State1 = blind_confirm(CRef, gb_sets:singleton(MsgId), - removed, State), + ignored, State), %% If all writes get eliminated, cur_file_cache_ets could %% grow unbounded. To prevent that we delete the cache %% entry here, but only if the message isn't in the @@ -831,7 +831,7 @@ handle_cast({remove, CRef, MsgIds}, State) -> end end, {[], State}, MsgIds), noreply(maybe_compact(client_confirm(CRef, gb_sets:from_list(RemovedMsgIds), - removed, State1))); + ignored, State1))); handle_cast({combine_files, Source, Destination, Reclaimed}, State = #msstate { sum_file_size = SumFileSize, diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index b853d983..95d2ccb4 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -1291,7 +1291,7 @@ blind_confirm(Callback, MsgIdSet) -> Callback(?MODULE, fun (?MODULE, State) -> record_confirms(MsgIdSet, State) end). -msgs_written_to_disk(Callback, MsgIdSet, removed) -> +msgs_written_to_disk(Callback, MsgIdSet, ignored) -> blind_confirm(Callback, MsgIdSet); msgs_written_to_disk(Callback, MsgIdSet, written) -> Callback(?MODULE, |