Merge pull request #16186 from rabbitmq/mergify/bp/v4.3.x/pr-16185

Fix consumer count for quorum queues in queue.declare (backport #16185)

Author: kjnilsson

deps/rabbit/src/rabbit_fifo_client.erl

@@ -579,7 +579,7 @@ stat(Leader, Timeout) ->
     %% but we use it for backwards compatibilty
     case ra:member_overview(Leader, Timeout) of
       {ok, #{machine := #{num_ready_messages := R,
-                          num_checked_out := C}}, _} ->
+                          num_consumers := C}}, _} ->
             {ok, R, C};
       {error, _} = Error ->
             Error;

deps/rabbit/test/quorum_queue_SUITE.erl

@@ -216,6 +216,7 @@ all_tests() ->
      consumer_priorities,
      cancel_consumer_gh_3729,
      cancel_consumer_gh_12424,
+     queue_declare_passive_consumer_count,
      cancel_and_consume_with_same_tag,
      validate_messages_on_queue,
      amqpl_headers,
@@ -5242,6 +5243,30 @@ cancel_consumer_gh_12424(Config) ->
 
     ok.
 
+queue_declare_passive_consumer_count(Config) ->
+    QQ = ?config(queue_name, Config),
+
+    Server = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename),
+    Ch = rabbit_ct_client_helpers:open_channel(Config, Server),
+
+    ExpectedDeclareRslt0 = #'queue.declare_ok'{queue = QQ, message_count = 0, consumer_count = 0},
+    DeclareRslt0 = declare(Ch, QQ, [{<<"x-queue-type">>, longstr, <<"quorum">>}]),
+    ?assertMatch(ExpectedDeclareRslt0, DeclareRslt0),
+
+    ok = subscribe(Ch, QQ, false),
+
+    ExpectedDeclareRslt1 = #'queue.declare_ok'{queue = QQ, message_count = 0, consumer_count = 1},
+    DeclareRslt1 = amqp_channel:call(Ch, #'queue.declare'{queue = QQ, passive = true}),
+    ?assertMatch(ExpectedDeclareRslt1, DeclareRslt1),
+
+    ok = cancel(Ch),
+
+    ExpectedDeclareRslt2 = #'queue.declare_ok'{queue = QQ, message_count = 0, consumer_count = 0},
+    DeclareRslt2 = amqp_channel:call(Ch, #'queue.declare'{queue = QQ, passive = true}),
+    ?assertMatch(ExpectedDeclareRslt2, DeclareRslt2),
+
+    ok.
+
     %% Test the scenario where a message is published to a quorum queue
 cancel_and_consume_with_same_tag(Config) ->
     %% https://github.com/rabbitmq/rabbitmq-server/issues/5927