Skip to content

Shovels bugfixes (backport #14757) #14761

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 4 commits into from
Oct 20, 2025
Merged

Shovels bugfixes (backport #14757) #14761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
56023fe
Revert "Shovel bugfix: requeue rejected messages with AMQP1.0"
dcorbacho Oct 20, 2025
704c2d3
Shovels: skip tests cases until rejection behaviour is unified
dcorbacho Oct 20, 2025
a0c1c0c
Shovel bugfix: use 'last_acked_tag' to keep track of acked/nacked mes…
dcorbacho Oct 20, 2025
a3bbc52
amqp10_client: Accept the `{shutdown, _}` exit reason is `close_sent/3`
dumbbell Oct 20, 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
3 changes: 3 additions & 0 deletions deps/amqp10_client/src/amqp10_client_connection.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,9 @@ close_sent(_EvtType, heartbeat, _Data) ->
close_sent(_EvtType, {'EXIT', _Pid, shutdown}, _Data) ->
%% monitored processes may exit during closure
keep_state_and_data;
close_sent(_EvtType, {'EXIT', _Pid, {shutdown, _}}, _Data) ->
%% monitored processes may exit during closure
keep_state_and_data;
close_sent(_EvtType, {'DOWN', _Ref, process, ReaderPid, _Reason},
#state{reader = ReaderPid}) ->
%% if the reader exits we probably won't receive a close frame
Expand Down
10 changes: 5 additions & 5 deletions deps/rabbitmq_shovel/src/rabbit_amqp10_shovel.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,13 +306,13 @@ ack(Tag, false, State = #{source := #{current := #{link := LinkRef}} = Src}) ->
-spec nack(Tag :: tag(), Multi :: boolean(), state()) -> state().
nack(Tag, false, State = #{source := #{current := #{link := LinkRef}} = Src}) ->
% the tag is the same as the deliveryid
ok = amqp10_client_session:disposition(LinkRef, Tag, Tag, true, released),
State#{source => Src#{last_nacked_tag => Tag}};
ok = amqp10_client_session:disposition(LinkRef, Tag, Tag, true, rejected),
State#{source => Src#{last_acked_tag => Tag}};
nack(Tag, true, State = #{source := #{current := #{link := LinkRef},
last_nacked_tag := LastTag} = Src}) ->
last_acked_tag := LastTag} = Src}) ->
First = LastTag + 1,
ok = amqp10_client_session:disposition(LinkRef, First, Tag, true, released),
State#{source => Src#{last_nacked_tag => Tag}}.
ok = amqp10_client_session:disposition(LinkRef, First, Tag, true, rejected),
State#{source => Src#{last_acked_tag => Tag}}.

status(#{dest := #{current := #{link_state := attached}}}) ->
flow;
Expand Down
8 changes: 6 additions & 2 deletions deps/rabbitmq_shovel/test/shovel_dynamic_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,12 @@ tests() ->
autodelete_quorum_on_confirm_no_transfer,
autodelete_classic_on_publish_no_transfer,
autodelete_quorum_on_publish_no_transfer,
autodelete_classic_on_confirm_with_rejections,
autodelete_quorum_on_confirm_with_rejections,
%% AMQP091 and local shovels requeue messages on reject
%% AMQP10 discards messages on reject
%% These two tests will remain commented out until the
%% behaviour is unified.
%% autodelete_classic_on_confirm_with_rejections,
%% autodelete_quorum_on_confirm_with_rejections,
autodelete_classic_on_publish_with_rejections,
autodelete_quorum_on_publish_with_rejections
].
Expand Down
Loading