diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2021-11-23 16:37:18 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2021-11-23 16:37:46 +0300 |
| commit | e22e667a103fcb1460896906fe97c7ea6c0ce460 (patch) | |
| tree | 256cdc666dafb52c223415fcbfdebc10176687a7 | |
| parent | 0f0da778d0c47e75a5aa6cc5adb6a2f1a2ffcc4e (diff) | |
| download | rabbitmq-server-git-e22e667a103fcb1460896906fe97c7ea6c0ce460.tar.gz | |
Do not count unroutable message in global totals
| -rw-r--r-- | deps/rabbit/src/rabbit_channel.erl | 2 | ||||
| -rw-r--r-- | deps/rabbit/test/queue_type_SUITE.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/deps/rabbit/src/rabbit_channel.erl b/deps/rabbit/src/rabbit_channel.erl index 4d85070001..37e8fd21ae 100644 --- a/deps/rabbit/src/rabbit_channel.erl +++ b/deps/rabbit/src/rabbit_channel.erl @@ -2166,7 +2166,7 @@ deliver_to_queues({Delivery = #delivery{message = Message = #basic_message{ex Qs = rabbit_amqqueue:lookup(AllNames), case rabbit_queue_type:deliver(Qs, Delivery, QueueStates0) of {ok, QueueStates, Actions} -> - rabbit_global_counters:messages_routed(amqp091, 1), + rabbit_global_counters:messages_routed(amqp091, erlang:min(1, length(Qs))), %% NB: the order here is important since basic.returns must be %% sent before confirms. ok = process_routing_mandatory(Mandatory, Qs, Message, State0), diff --git a/deps/rabbit/test/queue_type_SUITE.erl b/deps/rabbit/test/queue_type_SUITE.erl index 64a562007b..8e4c2a39fa 100644 --- a/deps/rabbit/test/queue_type_SUITE.erl +++ b/deps/rabbit/test/queue_type_SUITE.erl @@ -163,7 +163,7 @@ smoke(Config) -> %% get and ack basic_ack(Ch, basic_get(Ch, QName)), %% global counters - publish_and_confirm(Ch, <<"inexistent_queue">>, <<"msg4">>), + publish_and_confirm(Ch, <<"non-existent_queue">>, <<"msg4">>), ConsumerTag3 = <<"ctag3">>, ok = subscribe(Ch, QName, ConsumerTag3), ProtocolCounters = maps:get([{protocol, amqp091}], get_global_counters(Config)), |