Fix memory_breakdown for connection procs

Instead of trying to read the ranch_server ETS table directly,
use an internal Ranch function that does the same. While neither
are documented, the latter is less likely to change.

(cherry picked from commit 0ee8a0612ebe7dcb5ef1cd5bf717c1cecac09bc7)

# Conflicts:
#	release-notes/3.9.8.md

3 files changed, 105 insertions, 1 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.8.24.md b/release-notes/3.8.24.md
new file mode 100644
index 0000000000..0ca58f9fae
--- /dev/null
+++ b/release-notes/3.8.24.md
@@ -0,0 +1,63 @@
+## RabbitMQ 3.8.24
+
+RabbitMQ `3.8.24` is a maintenance release.
+All users are recommended to upgrade to this release.
+
+### Obtaining Packages
+
+RabbitMQ releases are distributed via [GitHub](https://github.com/rabbitmq/rabbitmq-server/releases), [Cloudsmith](https://cloudsmith.io/~rabbitmq/repos/),
+and [PackageCloud](https://packagecloud.io/rabbitmq).
+
+### Erlang/OTP Compatibility Notes
+
+This release [requires Erlang 23.2](https://www.rabbitmq.com/which-erlang.html) and [supports Erlang 24](https://blog.rabbitmq.com/posts/2021/03/erlang-24-support-roadmap/).
+
+[Provisioning Latest Erlang Releases](https://www.rabbitmq.com/which-erlang.html#erlang-repositories) explains
+what package repositories and tools can be used to provision modern Erlang versions.
+
+
+## Upgrade and Compatibility Notes
+
+See the [Upgrading guide](https://www.rabbitmq.com/upgrade.html) for general documentation on upgrades and
+[RabbitMQ change log](https://www.rabbitmq.com/changelog.html) for release notes of other releases.
+
+If upgrading from a`3.7.x` release, see [3.8.0 release notes](https://github.com/rabbitmq/rabbitmq-server/releases/tag/v3.8.0)
+upgrade and compatibility notes first.
+
+If upgrading from a `3.6.x` or older [release series](https://www.rabbitmq.com/versions.html), first upgrade
+to [`3.7.27`](https://github.com/rabbitmq/rabbitmq-server/releases/tag/v3.7.27) and then to this version.
+
+
+## Getting Help
+
+Any questions about this release, upgrades or RabbitMQ in general are welcome on the [RabbitMQ mailing list](https://groups.google.com/forum/#!forum/rabbitmq-users)
+and [RabbitMQ community Slack](https://rabbitmq-slack.herokuapp.com/).
+
+
+## Changes Worth Mentioning
+
+Release notes are kept under [rabbitmq-server/release-notes](https://github.com/rabbitmq/rabbitmq-server/tree/v3.8.x/release-notes).
+Contributors are encouraged to update them together with their changes.  This helps with release automation and more
+consistent release schedule.
+
+
+### Core Server
+
+#### Bug Fixes
+
+* `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
+
+ * ...
+
+
+## Source Code Archives
+
+To obtain source code of the entire distribution, please download the archive named `rabbitmq-server-3.8.24.tar.xz`
+instead of the source tarball produced by GitHub.
+
diff --git a/release-notes/3.9.8.md b/release-notes/3.9.8.md
new file mode 100644
index 0000000000..f5db3fbd4e
--- /dev/null
+++ b/release-notes/3.9.8.md
@@ -0,0 +1,41 @@
+RabbitMQ `3.9.8` is a maintenance release in the `3.9.x` release series.
+
+Please refer to the **Upgrading to 3.9** section from [v3.9.0 release notes](https://github.com/rabbitmq/rabbitmq-server/releases/tag/v3.9.0) if upgrading from a version prior to 3.9.0.
+
+This release requires at least Erlang 23.2, and supports the latest Erlang 24 version, 24.1.2 at the time of release. [RabbitMQ and Erlang/OTP Compatibility Matrix](https://www.rabbitmq.com/which-erlang.html) has more details on Erlang version requirements for RabbitMQ.
+
+
+
+## Changes Worth Mentioning
+
+Release notes are kept under [rabbitmq-server/release-notes](https://github.com/rabbitmq/rabbitmq-server/tree/v3.9.x/release-notes).
+Contributors are encouraged to update them together with their changes. This helps with release automation and a more consistent release schedule.
+
+### Core Server
+
+#### Enhancements
+
+ * ...
+
+
+#### Bug Fixes
+
+* 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)
+
+* `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
+
+ * ...
+
+
+## Source Code Archives
+
+To obtain source code of the entire distribution, please download the archive named `rabbitmq-server-3.9.8.tar.xz` instead of the source tarball produced by GitHub.