Skip to content

By @dcorbacho and me: introduce [cluster-]local shovels, adopt message containers for shovels #14256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 36 commits into from
Aug 20, 2025
Merged

By @dcorbacho and me: introduce [cluster-]local shovels, adopt message containers for shovels #14256

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
6e6a33e
Shovel: use message containers
dcorbacho Jun 13, 2025
ccd3bde
amqp10_msg: type spec & code refactor
dcorbacho Jun 20, 2025
c884078
AMQP10 shovel: make bare message inmutable
dcorbacho Jul 4, 2025
444b564
Local shovels
dcorbacho Jun 23, 2025
6fce51d
WIP
dcorbacho Jul 16, 2025
acbd4b4
Local shovel: use queue name to filter source/dest messages
dcorbacho Jul 17, 2025
c8127ea
Local shovel: Initialise delivery count for credit
dcorbacho Jul 17, 2025
860eb6c
Local shovel: fix initial delivery count and state handling
dcorbacho Jul 18, 2025
a112aa5
Local shovels: set link credit
dcorbacho Jul 18, 2025
f381993
Local shovels: renew credit
dcorbacho Jul 20, 2025
c3ec85f
Local shovel: finish credit flow handling
dcorbacho Jul 20, 2025
085c0cc
Local shovels: remove rabbit_log and switch to LOG_ macros
dcorbacho Jul 22, 2025
ae6a36a
Local shovels: remove unused parameter
dcorbacho Jul 22, 2025
2e2dc4b
Shovel tests: ignore nodename
dcorbacho Jul 22, 2025
b5a2dac
Local shovels: grant credit after confirming
dcorbacho Jul 23, 2025
30f67e0
local_dynamic_SUITE: await credit for publishing links
michaelklishin Jul 23, 2025
a855146
Local shovel: handle destination queue events
dcorbacho Jul 24, 2025
a0d42ea
Local shovels: remove unused prefetch count
dcorbacho Jul 24, 2025
be061cd
Local shovel: fix credit handling order
dcorbacho Jul 28, 2025
414da5d
local_dynamic_SUITE: ignore two expected crash reports in the logs
michaelklishin Jul 28, 2025
78167f0
Local shovel: more tests
dcorbacho Jul 29, 2025
bb5e1d9
Local shovels: handle credit on sender side
dcorbacho Jul 29, 2025
8c9f79f
Shovel management: add local shovels
dcorbacho Jul 30, 2025
0b1aefd
Local shovels: move unacked_message_q inside source config
dcorbacho Aug 12, 2025
e9d767b
Local shovels: fix credit flow
dcorbacho Aug 13, 2025
07a0853
Local shovels: optimisations
dcorbacho Aug 13, 2025
edf0e3c
Local shovel: remove unused clause
dcorbacho Aug 13, 2025
02fcbc0
Local shovels: optimisation
dcorbacho Aug 13, 2025
3349321
Local shovels: fix credit flow
dcorbacho Aug 13, 2025
382fac3
Local shovels: remove stashed credit request
dcorbacho Aug 14, 2025
6bb649a
Local shovels: single acks
dcorbacho Aug 14, 2025
a419ab3
Shovels: re-order confirmation and unacked update
dcorbacho Aug 18, 2025
4452872
Local shovels: Update default credit
dcorbacho Aug 18, 2025
d475a0e
Rename a Shovel key to 'shovel.local.max_credit'
michaelklishin Aug 18, 2025
212ae64
Local shovels: place behind rabbitmq_4.0.0 feature flag
dcorbacho Aug 19, 2025
ce8fa31
Merge branch 'main' into local-shovel
michaelklishin Aug 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions deps/rabbitmq_shovel/priv/schema/rabbitmq_shovel.schema
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@
{mapping, "shovel.topology.predeclared", "rabbitmq_shovel.topology.predeclared", [
[{datatype, {enum, [true, false]}}]
]}.

{mapping, "max_local_shovel_credit", "rabbitmq_shovel.max_local_shovel_credit", [
{datatype, integer}
]}.
4 changes: 2 additions & 2 deletions deps/rabbitmq_shovel/src/rabbit_local_shovel.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
%% sequence number initialized at an arbitrary point by the sender."
%% See rabbit_amqp_session.erl
-define(INITIAL_DELIVERY_COUNT, 16#ff_ff_ff_ff - 4).
-define(DEFAULT_MAX_LINK_CREDIT, 170).
-define(DEFAULT_MAX_LINK_CREDIT, 1000).

-record(pending_ack, {
delivery_tag,
Expand Down Expand Up @@ -677,7 +677,7 @@ maybe_grant_credit(#{source := #{queue_r := QName,
handle_queue_actions(Actions, State).

max_link_credit() ->
application:get_env(rabbit, max_link_credit, ?DEFAULT_MAX_LINK_CREDIT).
application:get_env(rabbitmq_shovel, max_local_shovel_credit, ?DEFAULT_MAX_LINK_CREDIT).

grant_link_credit(Credit, MaxLinkCredit, NumUnconfirmed) ->
Credit =< MaxLinkCredit div 2 andalso
Expand Down
Loading