root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #7548 from cloudamqp/vm_memory_stream_coordinator 

Fix rabbit_vm:memory returning stream_queue_coordinator_procs
This commit is contained in:
Michael Klishin 2023-03-14 21:56:08 +04:00 committed by GitHub
parent 9fb828cf39 21e1d8655d
commit bb78f77aa4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
deps/rabbit/src/rabbit_vm.erl vendored
View File

@ -177,7 +177,8 @@ bytes(Words) -> try
end. end.
interesting_sups() -> interesting_sups() ->
[queue_sups(), quorum_sups(), dlx_sups(), stream_server_sups(), stream_reader_sups(), [queue_sups(), quorum_sups(), dlx_sups(),
stream_server_sups(), stream_reader_sups(), stream_coordinator(),
conn_sups() | interesting_sups0()]. conn_sups() | interesting_sups0()].
queue_sups() -> queue_sups() ->
@ -188,6 +189,7 @@ quorum_sups() -> [ra_server_sup_sup].
dlx_sups() -> [rabbit_fifo_dlx_sup]. dlx_sups() -> [rabbit_fifo_dlx_sup].
stream_server_sups() -> [osiris_server_sup]. stream_server_sups() -> [osiris_server_sup].
stream_reader_sups() -> [osiris_replica_reader_sup]. stream_reader_sups() -> [osiris_replica_reader_sup].
stream_coordinator() -> [rabbit_stream_coordinator].
msg_stores() -> msg_stores() ->
all_vhosts_children(msg_store_transient) all_vhosts_children(msg_store_transient)
@ -234,18 +236,17 @@ ranch_server_sups() ->
with(Sups, With) -> [{Sup, With} || Sup <- Sups]. with(Sups, With) -> [{Sup, With} || Sup <- Sups].
distinguishers() -> with(queue_sups(), fun queue_type/1) ++ distinguishers() -> with(queue_sups(), fun queue_type/1) ++
with(conn_sups(), fun conn_type/1) ++ with(conn_sups(), fun conn_type/1).
with(quorum_sups(), fun ra_type/1).
distinguished_interesting_sups() -> distinguished_interesting_sups() ->
[ [
with(queue_sups(), master), with(queue_sups(), master),
with(queue_sups(), slave), with(queue_sups(), slave),
with(quorum_sups(), quorum), quorum_sups(),
dlx_sups(), dlx_sups(),
stream_server_sups(), stream_server_sups(),
stream_reader_sups(), stream_reader_sups(),
with(quorum_sups(), stream), stream_coordinator(),
with(conn_sups(), reader), with(conn_sups(), reader),
with(conn_sups(), writer), with(conn_sups(), writer),
with(conn_sups(), channel), with(conn_sups(), channel),
@ -302,12 +303,6 @@ conn_type(PDict) ->
_ -> other _ -> other
end. end.
ra_type(PDict) ->
case keyfind('$rabbit_vm_category', PDict) of
{value, rabbit_stream_coordinator} -> stream;
_ -> quorum
end.
%%---------------------------------------------------------------------------- %%----------------------------------------------------------------------------
%% NB: this code is non-rabbit specific. %% NB: this code is non-rabbit specific.