Skip to content
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

Jump to bottom

HTTP API: GET /api/queues/{vhost}/{name} now supports enable_queue_totals #10839

Merged
merged 1 commit into from Mar 25, 2024
Merged

HTTP API: GET /api/queues/{vhost}/{name} now supports enable_queue_totals #10839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 24 additions & 3 deletions deps/rabbitmq_management/src/rabbit_mgmt_wm_queue.erl
View file
Open in desktop
Expand Up @@ -50,8 +50,13 @@ to_json(ReqData, Context) ->
rabbit_mgmt_format:strip_pids(Q)),
rabbit_mgmt_util:reply(ensure_defaults(Payload), ReqData, Context);
true ->
rabbit_mgmt_util:reply(rabbit_mgmt_format:strip_pids(queue(ReqData)),
ReqData, Context)
Q = case rabbit_mgmt_util:enable_queue_totals(ReqData) of
false -> queue(ReqData);
true -> queue_with_totals(ReqData)
end,
rabbit_mgmt_util:reply(
rabbit_mgmt_format:strip_pids(Q),
ReqData, Context)
end
catch
{error, invalid_range_parameters, Reason} ->
Expand Down Expand Up @@ -110,10 +115,26 @@ queue(ReqData) ->
VHost -> queue(VHost, rabbit_mgmt_util:id(queue, ReqData))
end.


queue(VHost, QName) ->
Name = rabbit_misc:r(VHost, queue, QName),
case rabbit_amqqueue:lookup(Name) of
{ok, Q} -> rabbit_mgmt_format:queue(Q);
{error, not_found} -> not_found
end.

queue_with_totals(ReqData) ->
case rabbit_mgmt_util:vhost(ReqData) of
not_found -> not_found;
VHost -> queue_with_totals(VHost, rabbit_mgmt_util:id(queue, ReqData))
end.

queue_with_totals(VHost, QName) ->
Name = rabbit_misc:r(VHost, queue, QName),
case rabbit_amqqueue:lookup(Name) of
{ok, Q} -> QueueInfo = rabbit_amqqueue:info(Q,
[name, durable, auto_delete, exclusive,
owner_pid, arguments, type, state,
policy, totals, online, type_specific]),
rabbit_mgmt_format:queue_info(QueueInfo);
{error, not_found} -> not_found
end.
8 changes: 4 additions & 4 deletions deps/rabbitmq_management/test/rabbit_mgmt_only_http_SUITE.erl
View file
Open in desktop
Expand Up @@ -516,14 +516,14 @@ queues_enable_totals_test(Config) ->
vhost => <<"/">>,
durable => true,
auto_delete => false,
exclusive => false,
exclusive => null,
arguments => #{'x-queue-type' => <<"quorum">>},
leader => NodeBin,
messages => 2,
messages_ready => 2,
messages_unacknowledged => 0,
members => [NodeBin]}, Queue),

?assert(not maps:is_key(messages, Queue)),
?assert(not maps:is_key(messages_ready, Queue)),
?assert(not maps:is_key(messages_unacknowledged, Queue)),
?assert(not maps:is_key(message_stats, Queue)),
?assert(not maps:is_key(messages_details, Queue)),
?assert(not maps:is_key(reductions_details, Queue)),
Expand Down