Merge pull request #4459 from rabbitmq/mergify/bp/v3.10.x/pr-4458

Fix report crashing priority queues (backport #4458)

Author: michaelklishin

deps/rabbit/src/rabbit_priority_queue.erl

@@ -419,13 +419,18 @@ info(backing_queue_status, #state{bq = BQ, bqss = BQSs}) ->
           end, nothing, BQSs);
 info(head_message_timestamp, #state{bq = BQ, bqss = BQSs}) ->
     find_head_message_timestamp(BQ, BQSs, '');
+info(online, _) ->
+    '';
 info(Item, #state{bq = BQ, bqss = BQSs}) ->
     fold0(fun (_P, BQSN, Acc) ->
-                  Acc + BQ:info(Item, BQSN)
+                 add(Acc, BQ:info(Item, BQSN))
           end, 0, BQSs);
 info(Item, #passthrough{bq = BQ, bqs = BQS}) ->
     BQ:info(Item, BQS).
 
+add(Acc, Value) when is_number(Acc), is_number(Value) -> Acc + Value;
+add(_, Value) -> Value.
+
 invoke(Mod, {P, Fun}, State = #state{bq = BQ}) ->
     pick1(fun (_P, BQSN) -> BQ:invoke(Mod, Fun, BQSN) end, P, State);
 invoke(Mod, Fun, State = #state{bq = BQ, max_priority = P}) ->

deps/rabbit/test/priority_queue_SUITE.erl

@@ -27,6 +27,7 @@ groups() ->
                          {overflow_reject_publish_dlx, [], [reject]},
                          dropwhile_fetchwhile,
                          info_head_message_timestamp,
+                         unknown_info_key,
                          matching,
                          purge,
                          requeue,
@@ -397,6 +398,19 @@ info_head_message_timestamp1(_Config) ->
     PQ:delete_and_terminate(a_whim, BQS6),
     passed.
 
+unknown_info_key(Config) ->
+    {Conn, Ch} = rabbit_ct_client_helpers:open_connection_and_channel(Config, 0),
+    Q = <<"info-priority-queue">>,
+    declare(Ch, Q, 3),
+    publish(Ch, Q, [1, 2, 3]),
+    
+    {ok, [{pid, _Pid}, {unknown_key, ''}]} = info(Config, Q, [pid, unknown_key]),
+
+    delete(Ch, Q),
+    rabbit_ct_client_helpers:close_channel(Ch),
+    rabbit_ct_client_helpers:close_connection(Conn),
+    passed.
+
 ram_duration(_Config) ->
     QName = rabbit_misc:r(<<"/">>, queue, <<"ram_duration-queue">>),
     Q0 = rabbit_amqqueue:pseudo_queue(QName, self()),
@@ -518,4 +532,13 @@ queue_pid(Config, Nodename, Q) ->
     [Pid] = [P || [{name, Q1}, {pid, P}] <- Info, Q =:= Q1],
     Pid.
 
+info(Config, Q, InfoKeys) -> 
+    Nodename = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename),
+    {ok, Amq} = rabbit_ct_broker_helpers:rpc(
+            Config, Nodename,
+            rabbit_amqqueue, lookup, [rabbit_misc:r(<<"/">>, queue, Q)]),
+    Info = rabbit_ct_broker_helpers:rpc(
+             Config, Nodename,
+             rabbit_classic_queue, info, [Amq, InfoKeys]),
+    {ok, Info}.
 %%----------------------------------------------------------------------------