diff options
author | Michael Klishin <klishinm@vmware.com> | 2021-10-13 18:39:08 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-13 18:39:08 +0300 |
commit | 347a8135b3a5909b46af045ed6efebba522bb0ca (patch) | |
tree | 7bf52ac7501ee89bae7635ed707f036084e37e02 | |
parent | fe82b1d4ee74bf4c2f15744a05105b9e40e991bb (diff) | |
parent | fb72068c11cbc3c0dec1287c23eed0a23bbcce27 (diff) | |
download | rabbitmq-server-git-347a8135b3a5909b46af045ed6efebba522bb0ca.tar.gz |
Merge branch 'v3.9.x' into mergify/bp/v3.9.x/pr-3560
-rw-r--r-- | deps/rabbit/src/rabbit_vm.erl | 2 | ||||
-rw-r--r-- | release-notes/3.9.8.md | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/deps/rabbit/src/rabbit_vm.erl b/deps/rabbit/src/rabbit_vm.erl index 01fce8b962..f01c383b63 100644 --- a/deps/rabbit/src/rabbit_vm.erl +++ b/deps/rabbit/src/rabbit_vm.erl @@ -231,7 +231,7 @@ conn_sups() -> ranch_server_sups() -> try - ets:match(ranch_server, {{conns_sup, '_'}, '$1'}) + [Pid || {_, _, Pid} <- ranch_server:get_connections_sups()] catch %% Ranch ETS table doesn't exist yet error:badarg -> [] diff --git a/release-notes/3.9.8.md b/release-notes/3.9.8.md index 31cba1e0bb..890615b33d 100644 --- a/release-notes/3.9.8.md +++ b/release-notes/3.9.8.md @@ -23,7 +23,12 @@ Contributors are encouraged to update them together with their changes. This hel * When the mandatory flag was used when publishing to classic queues, but publisher confirms were not, channels memory usage would grow indefinitely. - GitHub issue: [#3560](https://github.com/rabbitmq/rabbitmq-server/issues/3560) + GitHub issue: [#3560](https://github.com/rabbitmq/rabbitmq-server/issues/3560) + +* `rabbitmq-diagnostics memory_breakdown` failed to read memory of connection + reader, writer and channel processes. + + GitHub issue: [#3570](https://github.com/rabbitmq/rabbitmq-server/issues/3570) ## Dependency Upgrades |