Skip to content

v4.2.x: select backports from v4.3.x (Mar 25, 2026) #15842

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
michaelklishin merged 3 commits into from
Mar 26, 2026
Merged

v4.2.x: select backports from v4.3.x (Mar 25, 2026) #15842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9dd086f
rabbit_khepri: Fix log message arguments
dumbbell Feb 6, 2026
1154ac6
Add debugging for MQTT flake
ansd Feb 25, 2026
88bf640
Fix `leader_transfer_send/3` for `v4.2.x`
michaelklishin Mar 24, 2026
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
2 changes: 1 addition & 1 deletion deps/rabbit/src/rabbit_khepri.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1864,7 +1864,7 @@ khepri_db_migration_enable(#{feature_name := FeatureName}) ->
"Feature flag `~s`: node ~0p already clustered (feature flag "
"enabled as part of clustering?); "
"skipping Mnesia->Khepri migration",
[node()],
[FeatureName, node()],
#{domain => ?RMQLOG_DOMAIN_DB}),
ok
end.
Expand Down
4 changes: 2 additions & 2 deletions deps/rabbit/test/amqp_client_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4058,12 +4058,12 @@ leader_transfer_send(QName, QType, Config) ->
ok = rabbit_ct_broker_helpers:kill_node(Config, 1),
ok = wait_for_accepts(NumMsgs),

ok = rabbit_ct_broker_helpers:start_node(Config, 1),
ok = detach_link_sync(Sender),
ok = delete_queue(Session0, QName),
ok = end_session_sync(Session0)
after
close_connection_sync(Connection0)
close_connection_sync(Connection0),
ok = rabbit_ct_broker_helpers:start_node(Config, 1)
end.

%% rabbitmqctl list_connections
Expand Down
12 changes: 7 additions & 5 deletions deps/rabbitmq_mqtt/test/mqtt_shared_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1487,13 +1487,13 @@ duplicate_client_id(Config) ->
eventually(?_assertEqual(0, length(all_connection_pids(Config)))).

session_reconnect(Config) ->
session_switch(Config, true).
session_switch(Config, true, ?FUNCTION_NAME).

session_takeover(Config) ->
session_switch(Config, false).
session_switch(Config, false, ?FUNCTION_NAME).

session_switch(Config, Disconnect) ->
Topic = ClientId = atom_to_binary(?FUNCTION_NAME),
session_switch(Config, Disconnect, Name) ->
Topic = ClientId = atom_to_binary(Name),
%% Connect to old node in mixed version cluster.
C1 = connect(ClientId, Config, 1, non_clean_sess_opts()),
{ok, _, [1]} = emqtt:subscribe(C1, Topic, qos1),
Expand All @@ -1518,7 +1518,9 @@ session_switch(Config, Disconnect) ->
%% New connection should be able to unsubscribe.
?assertMatch({ok, _, _}, emqtt:unsubscribe(C2, Topic)),
{ok, _} = emqtt:publish(C2, Topic, <<"m2">>, qos1),
receive Unexpected -> ct:fail({unexpected, Unexpected})
receive Unexpected ->
ct:pal("C1=~p C2=~p", [C1, C2]),
ct:fail({unexpected, Unexpected})
after 300 -> ok
end,

Expand Down
Loading