Merge branch 'main' into rabbitmq-server-7743-unblock-super-stream-partition-consumer-group

Author: michaelklishin

deps/rabbit/src/rabbit_reader.erl

@@ -66,6 +66,8 @@
 -record(v1, {
           %% parent process
           parent,
+          %% Ranch ref
+          ranch_ref,
           %% socket
           sock,
           %% connection state, see connection record
@@ -162,7 +164,7 @@ init(Parent, HelperSup, Ref) ->
     {ok, Sock} = rabbit_networking:handshake(Ref,
         application:get_env(rabbit, proxy_protocol, false)),
     Deb = sys:debug_options([]),
-    start_connection(Parent, HelperSup, Deb, Sock).
+    start_connection(Parent, HelperSup, Ref, Deb, Sock).
 
 -spec system_continue(_,_,{[binary()], non_neg_integer(), #v1{}}) -> any().
 
@@ -289,10 +291,10 @@ socket_op(Sock, Fun) ->
                            exit(normal)
     end.
 
--spec start_connection(pid(), pid(), any(), rabbit_net:socket()) ->
+-spec start_connection(pid(), pid(), ranch:ref(), any(), rabbit_net:socket()) ->
           no_return().
 
-start_connection(Parent, HelperSup, Deb, Sock) ->
+start_connection(Parent, HelperSup, RanchRef, Deb, Sock) ->
     process_flag(trap_exit, true),
     RealSocket = rabbit_net:unwrap_socket(Sock),
     Name = case rabbit_net:connection_string(Sock, inbound) of
@@ -310,6 +312,7 @@ start_connection(Parent, HelperSup, Deb, Sock) ->
         socket_op(Sock, fun (S) -> rabbit_net:socket_ends(S, inbound) end),
     ?store_proc_name(Name),
     State = #v1{parent              = Parent,
+                ranch_ref           = RanchRef,
                 sock                = RealSocket,
                 connection          = #connection{
                   name               = Name,
@@ -1209,16 +1212,16 @@ handle_method0(#'connection.tune_ok'{frame_max   = FrameMax,
              heartbeater = Heartbeater};
 
 handle_method0(#'connection.open'{virtual_host = VHost},
-               State = #v1{connection_state = opening,
+               State = #v1{ranch_ref        = RanchRef,
+                           connection_state = opening,
                            connection       = Connection = #connection{
                                                 log_name = ConnName,
-                                                port = Port,
                                                 user = User = #user{username = Username},
                                                 protocol = Protocol},
                            helper_sup       = SupPid,
                            sock             = Sock,
                            throttle         = Throttle}) ->
-    ok = is_over_node_connection_limit(Port),
+    ok = is_over_node_connection_limit(RanchRef),
     ok = is_over_vhost_connection_limit(VHost, User),
     ok = is_over_user_connection_limit(User),
     ok = rabbit_access_control:check_vhost_access(User, VHost, {socket, Sock}, #{}),
@@ -1319,18 +1322,21 @@ is_vhost_alive(VHostPath, User) ->
                             [VHostPath, User#user.username, VHostPath])
     end.
 
-is_over_node_connection_limit(Port) ->
-    {Addr, _, _} = hd(rabbit_networking:tcp_listener_addresses(Port)),
-    Ref = rabbit_networking:ranch_ref(Addr, Port),
-    #{active_connections := ActiveConns} = ranch:info(Ref),
+is_over_node_connection_limit(RanchRef) ->
     Limit = rabbit_misc:get_env(rabbit, connection_max, infinity),
-    case ActiveConns > Limit of
-        false -> ok;
-        true ->
-            rabbit_misc:protocol_error(not_allowed,
-                                       "connection refused: "
-                                       "node connection limit (~tp) is reached",
-                                       [Limit])
+    case Limit of
+        infinity -> ok;
+        N when is_integer(N) ->
+            #{active_connections := ActiveConns} = ranch:info(RanchRef),
+
+            case ActiveConns > Limit of
+                false -> ok;
+                true ->
+                    rabbit_misc:protocol_error(not_allowed,
+                                            "connection refused: "
+                                            "node connection limit (~tp) is reached",
+                                            [Limit])
+            end
     end.
 
 is_over_vhost_connection_limit(VHostPath, User) ->

release-notes/3.11.13.md

@@ -0,0 +1,41 @@
+RabbitMQ `3.11.13` is a maintenance release in the `3.11.x` [release series](https://www.rabbitmq.com/versions.html).
+
+Please refer to the upgrade section from [v3.11.0 release notes](https://github.com/rabbitmq/rabbitmq-server/releases/tag/v3.11.0)
+if upgrading from a version prior to 3.11.0.
+
+This release requires Erlang 25.
+[RabbitMQ and Erlang/OTP Compatibility Matrix](https://www.rabbitmq.com/which-erlang.html) has more details on
+Erlang version requirements for RabbitMQ.
+
+
+### Minimum Supported Erlang Version
+
+As of 3.11.0, RabbitMQ requires Erlang 25. Nodes **will fail to start** on older Erlang releases.
+
+Erlang 25 as our new baseline means much improved performance on ARM64 architectures, [profiling with flame graphs](https://blog.rabbitmq.com/posts/2022/05/flame-graphs/)
+across all architectures, and the most recent TLS 1.3 implementation available to all RabbitMQ 3.11 users.
+
+
+## Changes Worth Mentioning
+
+Release notes can be found on GitHub at [rabbitmq-server/release-notes](https://github.com/rabbitmq/rabbitmq-server/tree/v3.11.x/release-notes).
+
+### Core Server
+
+#### Bug Fixes
+
+ * `3.11.12` introduced a regression that caused client connections to fail with an exception
+   when TCP or TLS listeners were bould to a particular interface.
+
+   GitHub issue: [#7788](https://github.com/rabbitmq/rabbitmq-server/pull/7788)
+
+
+## Dependency Upgrades
+
+None in this release.
+
+
+## Source Code Archives
+
+To obtain source code of the entire distribution, please download the archive named `rabbitmq-server-3.11.13.tar.xz`
+instead of the source tarball produced by GitHub.