Skip to content

Commit 3fc685b

Browse files
committed
Reject quorum queue messages with reason maxlen on drop-head
As specified for RMQ ttl
1 parent 6139d42 commit 3fc685b

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/rabbit_fifo.erl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ apply(Meta, #discard{msg_ids = MsgIds, consumer_id = ConsumerId},
332332
case Cons0 of
333333
#{ConsumerId := Con0} ->
334334
Discarded = maps:with(MsgIds, Con0#consumer.checked_out),
335-
Effects = dead_letter_effects(Discarded, State0, []),
335+
Effects = dead_letter_effects(rejected, Discarded, State0, []),
336336
complete_and_checkout(Meta, MsgIds, ConsumerId, Con0,
337337
Effects, State0);
338338
_ ->
@@ -948,7 +948,7 @@ drop_head(#state{ra_indexes = Indexes0} = State0, Effects0) ->
948948
Indexes = rabbit_fifo_index:delete(RaftIdxToDrop, Indexes0),
949949
Bytes = message_size(Msg),
950950
State = add_bytes_drop(Bytes, State1#state{ra_indexes = Indexes}),
951-
Effects = dead_letter_effects(maps:put(none, FullMsg, #{}),
951+
Effects = dead_letter_effects(maxlen, maps:put(none, FullMsg, #{}),
952952
State, Effects0),
953953
{State, Effects};
954954
{{'$prefix_msg', Bytes}, State1} ->
@@ -1099,15 +1099,15 @@ complete_and_checkout(#{index := IncomingRaftIdx} = Meta, MsgIds, ConsumerId,
10991099
% settle metrics are incremented separately
11001100
update_smallest_raft_index(IncomingRaftIdx, Indexes0, State, Effects).
11011101

1102-
dead_letter_effects(_Discarded,
1102+
dead_letter_effects(_Reason, _Discarded,
11031103
#state{dead_letter_handler = undefined},
11041104
Effects) ->
11051105
Effects;
1106-
dead_letter_effects(Discarded,
1106+
dead_letter_effects(Reason, Discarded,
11071107
#state{dead_letter_handler = {Mod, Fun, Args}}, Effects) ->
11081108
DeadLetters = maps:fold(fun(_, {_, {_, {_Header, Msg}}},
11091109
% MsgId, MsgIdID, RaftId, Header
1110-
Acc) -> [{rejected, Msg} | Acc]
1110+
Acc) -> [{Reason, Msg} | Acc]
11111111
end, [], Discarded),
11121112
[{mod_call, Mod, Fun, Args ++ [DeadLetters]} | Effects].
11131113

0 commit comments

Comments
 (0)