diff options
| author | Michal Kuratczyk <mkuratczyk@vmware.com> | 2023-02-01 14:40:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-01 14:40:54 +0100 |
| commit | 67c123f91fbf8736bcdfb3efa519d0b84fb67f9a (patch) | |
| tree | a9f791812232df39e7678ee012ece7d9864807ac | |
| parent | 6fd7b983d8c5d86a827a1591cc0e812022be7fc4 (diff) | |
| parent | e330f683b63e9fe61b801a1f2d3e61d959cd6d31 (diff) | |
| download | rabbitmq-server-git-67c123f91fbf8736bcdfb3efa519d0b84fb67f9a.tar.gz | |
Merge pull request #7115 from rabbitmq/cq-perf-regression-fix
CQ: Fix performance regression after moving to v2 sets
| -rw-r--r-- | deps/rabbit/src/rabbit_msg_store.erl | 2 | ||||
| -rw-r--r-- | deps/rabbit/test/backing_queue_SUITE.erl | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/deps/rabbit/src/rabbit_msg_store.erl b/deps/rabbit/src/rabbit_msg_store.erl index 9c85120f1b..06e993c8d3 100644 --- a/deps/rabbit/src/rabbit_msg_store.erl +++ b/deps/rabbit/src/rabbit_msg_store.erl @@ -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}, diff --git a/deps/rabbit/test/backing_queue_SUITE.erl b/deps/rabbit/test/backing_queue_SUITE.erl index d0eb1216bb..7d3c83a6bf 100644 --- a/deps/rabbit/test/backing_queue_SUITE.erl +++ b/deps/rabbit/test/backing_queue_SUITE.erl @@ -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) |