Skip to content

Fix crash bug in QQ state conversion #2728

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 2 commits into from
Jan 20, 2021
Merged

Fix crash bug in QQ state conversion #2728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2418cf
Fix crash bug in QQ state conversion
kjnilsson Jan 20, 2021
6d1f3a1
rabbit_fifo: handle unhandled commands
kjnilsson Jan 20, 2021
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
6 changes: 5 additions & 1 deletion deps/rabbit/src/rabbit_fifo.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,10 @@ apply(Meta, #update_config{config = Conf}, State) ->
checkout(Meta, State, update_config(Conf, State), []);
apply(_Meta, {machine_version, 0, 1}, V0State) ->
State = convert_v0_to_v1(V0State),
{State, ok, []};
apply(_Meta, Cmd, State) ->
%% handle unhandled commands gracefully
rabbit_log:debug("rabbit_fifo: unhandled command ~W", [Cmd, 10]),
{State, ok, []}.

convert_v0_to_v1(V0State0) ->
Expand All @@ -532,7 +536,7 @@ convert_v0_to_v1(V0State0) ->
list_to_tuple(tuple_to_list(C0) ++ [0])
end, V0Cons),
V0SQ = rabbit_fifo_v0:get_field(service_queue, V0State),
V1SQ = priority_queue:from_list(queue:to_list(V0SQ)),
V1SQ = priority_queue:from_list([{0, C} || C <- queue:to_list(V0SQ)]),
Cfg = #cfg{name = rabbit_fifo_v0:get_cfg_field(name, V0State),
resource = rabbit_fifo_v0:get_cfg_field(resource, V0State),
release_cursor_interval = rabbit_fifo_v0:get_cfg_field(release_cursor_interval, V0State),
Expand Down
26 changes: 26 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 @@ -1518,6 +1518,32 @@ machine_version_test(_) ->
?assert(priority_queue:is_queue(S)),
ok.

machine_version_waiting_consumer_test(_) ->
V0 = rabbit_fifo_v0,
S0 = V0:init(#{name => ?FUNCTION_NAME,
queue_resource => rabbit_misc:r(<<"/">>, queue, <<"test">>)}),
Idx = 1,
{#rabbit_fifo{}, ok, []} = apply(meta(Idx), {machine_version, 0, 1}, S0),

Cid = {atom_to_binary(?FUNCTION_NAME, utf8), self()},
Entries = [
{1, rabbit_fifo_v0:make_enqueue(self(), 1, banana)},
{2, rabbit_fifo_v0:make_enqueue(self(), 2, apple)},
{3, rabbit_fifo_v0:make_checkout(Cid, {auto, 5, unsettled}, #{})}
],
{S1, _Effects} = rabbit_fifo_v0_SUITE:run_log(S0, Entries),
Self = self(),
{#rabbit_fifo{enqueuers = #{Self := #enqueuer{}},
consumers = #{Cid := #consumer{priority = 0}},
service_queue = S,
messages = Msgs}, ok, []} = apply(meta(Idx),
{machine_version, 0, 1}, S1),
%% validate message conversion to lqueue
?assertEqual(0, lqueue:len(Msgs)),
?assert(priority_queue:is_queue(S)),
?assertEqual(1, priority_queue:len(S)),
ok.

queue_ttl_test(_) ->
QName = rabbit_misc:r(<<"/">>, queue, <<"test">>),
Conf = #{name => ?FUNCTION_NAME,
Expand Down