Skip to content

Take "true" case into consideration #1685

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
Dec 17, 2018
Merged

Take "true" case into consideration #1685

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f88068
Take "true" case into consideration
lukebakken Aug 27, 2018
0be4ac3
Simplify to basically removing the pattern match that crashes
lukebakken Dec 14, 2018
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
12 changes: 11 additions & 1 deletion src/rabbit_amqqueue.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,17 @@ retry_wait(Q = #amqqueue{pid = QPid, name = Name, state = QState}, F, E, Retries
{stopped, false} ->
E({absent, Q, stopped});
_ ->
false = rabbit_mnesia:is_process_alive(QPid),
case rabbit_mnesia:is_process_alive(QPid) of
true ->
% rabbitmq-server#1682
% The old check would have crashed here,
% instead, log it and run the exit fun. absent & alive is weird,
% but better than crashing with badmatch,true
rabbit_log:debug("Unexpected alive queue process ~p~n", [QPid]),
E({absent, Q, alive});
false ->
ok % Expected result
end,
timer:sleep(30),
with(Name, F, E, RetriesLeft - 1)
end.
Expand Down