Skip to content

QQ: handle aux state upgrades from aux v1. #16990

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 2 commits into from
Jul 22, 2026
+73 −5
Merged

QQ: handle aux state upgrades from aux v1. #16990

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99c968a
QQ: handle aux state upgrades from aux v1.
kjnilsson Jul 21, 2026
61e3aa8
Add an aux_v3 => aux_v4 migration test #16990
michaelklishin Jul 21, 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
11 changes: 6 additions & 5 deletions deps/rabbit/src/rabbit_fifo.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1299,11 +1299,12 @@ init_aux(Name) when is_atom(Name) ->
messages_total = 0,
min_reclaimable = MinReclaimable}}.

handle_aux(RaftState, Tag, Cmd, AuxV2, RaAux)
when element(1, AuxV2) == aux_v2 ->
Name = element(2, AuxV2),
AuxV3 = init_aux(Name),
handle_aux(RaftState, Tag, Cmd, AuxV3, RaAux);
handle_aux(RaftState, Tag, Cmd, AuxPre, RaAux)
when element(1, AuxPre) == aux_v2 orelse
element(1, AuxPre) == aux ->
Name = element(2, AuxPre),
Aux = init_aux(Name),
handle_aux(RaftState, Tag, Cmd, Aux, RaAux);
handle_aux(RaftState, Tag, Cmd, AuxV3, RaAux)
when element(1, AuxV3) == aux_v3 ->
AuxV4 = #?AUX{name = element(2, AuxV3),
Expand Down
44 changes: 44 additions & 0 deletions deps/rabbit/test/rabbit_fifo_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4007,6 +4007,50 @@ aux_test(_) ->
meck:unload(),
ok.

%% covers upgrades from aux states as old as 3.13, e.g. 3.13 -> 4.2 -> 4.3
aux_upgrade_from_v1_test(_) ->
_ = ra_machine_ets:start_link(),
Name = ?FUNCTION_NAME,
%% shape of the aux state as used by rabbit_fifo_v0 / rabbit_fifo_v1
AuxV1 = {aux, Name, unused_capacity, unused_gc},
LastApplied = 0,
State0 = #{machine_state =>
init(#{name => Name,
queue_resource => rabbit_misc:r("/", queue, ?FUNCTION_NAME_B),
single_active_consumer_on => false}),
log => mock_log,
cfg => #cfg{},
last_applied => LastApplied},
ok = meck:new(ra_log, []),
meck:expect(ra_log, last_index_term, fun (_) -> {0, 0} end),
{no_reply, Aux, _, []} = handle_aux(leader, cast, tick, AuxV1, State0),
?assertEqual(aux_v4, element(1, Aux)),
?assertEqual(Name, element(2, Aux)),
meck:unload(),
ok.

aux_upgrade_from_v2_test(_) ->
_ = ra_machine_ets:start_link(),
Name = ?FUNCTION_NAME,
%% shape of the aux state as used by an earlier version of rabbit_fifo
AuxV2 = {aux_v2, Name, unused_last_decorators_state, unused_capacity,
unused_gc, unused_tick_pid, unused_cache},
LastApplied = 0,
State0 = #{machine_state =>
init(#{name => Name,
queue_resource => rabbit_misc:r("/", queue, ?FUNCTION_NAME_B),
single_active_consumer_on => false}),
log => mock_log,
cfg => #cfg{},
last_applied => LastApplied},
ok = meck:new(ra_log, []),
meck:expect(ra_log, last_index_term, fun (_) -> {0, 0} end),
{no_reply, Aux, _, []} = handle_aux(leader, cast, tick, AuxV2, State0),
?assertEqual(aux_v4, element(1, Aux)),
?assertEqual(Name, element(2, Aux)),
meck:unload(),
ok.

%% machine version conversion test

machine_version_test(Config) ->
Expand Down
Loading