root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #7115 from rabbitmq/cq-perf-regression-fix 

CQ: Fix performance regression after moving to v2 sets
This commit is contained in:
Michal Kuratczyk 2023-02-01 14:40:54 +01:00 committed by GitHub
parent 6fd7b983d8 e330f683b6
commit 67c123f91f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/rabbit/src/rabbit_msg_store.erl vendored
View File

@ -936,7 +936,7 @@ handle_cast({remove, CRef, MsgIds}, State) ->
ignore -> {Removed, State2}
end
end, {[], State}, MsgIds),
noreply(maybe_compact(client_confirm(CRef, sets:from_list(RemovedMsgIds),
noreply(maybe_compact(client_confirm(CRef, sets:from_list(RemovedMsgIds, [{version, 2}]),
ignored, State1)));
handle_cast({combine_files, Source, Destination, Reclaimed},

4
deps/rabbit/test/backing_queue_SUITE.erl vendored
View File

@ -1608,7 +1608,7 @@ publish_and_confirm(Q, Payload, Count) ->
{ok, Acc, _Actions} = rabbit_queue_type:deliver([Q], Delivery, Acc0),
Acc
end, QTState0, Seqs),
wait_for_confirms(sets:from_list(Seqs)),
wait_for_confirms(sets:from_list(Seqs, [{version, 2}])),
QTState.
wait_for_confirms(Unconfirmed) ->
@ -1619,7 +1619,7 @@ wait_for_confirms(Unconfirmed) ->
{'$gen_cast', {queue_event, _QName, {confirm, Confirmed, _}}} ->
wait_for_confirms(
sets:subtract(
Unconfirmed, sets:from_list(Confirmed)))
Unconfirmed, sets:from_list(Confirmed, [{version, 2}])))
after ?TIMEOUT ->
flush(),
exit(timeout_waiting_for_confirm)