Skip to content

Commit 05ab88d

Browse files
Merge pull request #1806 from rabbitmq/report-message-bytes
quorum queue: reset message bytes on purge
2 parents e8fb108 + d6dd9d0 commit 05ab88d

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

src/rabbit_fifo.erl

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,8 @@ apply(#{index := RaftIdx}, #purge{}, Effects0,
429429
State1#state{ra_indexes = rabbit_fifo_index:empty(),
430430
messages = #{},
431431
returns = lqueue:new(),
432+
msg_bytes_enqueue = 0,
433+
msg_bytes_checkout = 0,
432434
low_msg_num = undefined}, Effects1),
433435
{State, [garbage_collection | Effects], {purge, Total}};
434436
apply(_, {down, ConsumerPid, noconnection},
@@ -1866,9 +1868,14 @@ purge_test() ->
18661868
purge_with_checkout_test() ->
18671869
Cid = {<<"purge_test">>, self()},
18681870
{State0, _} = check_auto(Cid, 1, test_init(?FUNCTION_NAME)),
1869-
{State1, _} = enq(2, 1, first, State0),
1870-
{State2, _} = enq(3, 2, second, State1),
1871+
{State1, _} = enq(2, 1, <<"first">>, State0),
1872+
{State2, _} = enq(3, 2, <<"second">>, State1),
1873+
%% assert message bytes are non zero
1874+
?assert(State2#state.msg_bytes_checkout > 0),
1875+
?assert(State2#state.msg_bytes_enqueue > 0),
18711876
{State3, _, {purge, 2}} = apply(meta(2), make_purge(), [], State2),
1877+
?assertEqual(0, State3#state.msg_bytes_checkout),
1878+
?assertEqual(0, State3#state.msg_bytes_enqueue),
18721879
#consumer{checked_out = Checked} = maps:get(Cid, State3#state.consumers),
18731880
?assertEqual(0, maps:size(Checked)),
18741881
ok.

0 commit comments

Comments
 (0)