Merge branch 'cloudamqp-fix_num_messages_delayed'

Author: michaelklishin

src/rabbit_delayed_message.erl

@@ -98,7 +98,8 @@ disable_plugin() ->
     ok.
 
 messages_delayed(Exchange) ->
-    MatchHead = #delay_entry{delay_key = make_key('_', Exchange),
+    ExchangeName = Exchange#exchange.name,
+    MatchHead = #delay_entry{delay_key = make_key('_', #exchange{name = ExchangeName, _ = '_'}),
                              delivery  = '_', ref       = '_'},
     Delays = mnesia:dirty_select(?TABLE_NAME, [{MatchHead, [], ['$_']}]),
     length(Delays).

test/plugin_SUITE.erl

@@ -220,15 +220,29 @@ delayed_messages_count(Config) ->
     Exchanges = rabbit_ct_broker_helpers:rpc(Config, 0,
           rabbit_exchange, info_all, [<<"/">>]),
 
-    [Exchange] = lists:filter(
+    FilterEx =
         fun(X) ->
-            {resource, <<"/">>, exchange, Ex} == proplists:get_value(name, X)
+                {resource, <<"/">>, exchange, Ex} == proplists:get_value(name, X)
         end,
-        Exchanges),
+
+    [Exchange] = lists:filter(FilterEx, Exchanges),
     {messages_delayed, 6} = proplists:lookup(messages_delayed, Exchange),
 
+    %% Set a policy for the exchange
+    PolicyName = make_policy_name(Config, "1"),
+    rabbit_ct_broker_helpers:set_policy(
+      Config, 0, PolicyName, <<"^", Ex/binary>>, <<"exchanges">>, [{<<"alternate-exchange">>, <<"altex">>}]),
+
+    %% Same message count returned for modified exchange
+    Exchanges2 = rabbit_ct_broker_helpers:rpc(Config, 0,
+          rabbit_exchange, info_all, [<<"/">>]),
+
+    [Exchange2] = lists:filter(FilterEx, Exchanges2),
+    {messages_delayed, 6} = proplists:lookup(messages_delayed, Exchange2),
+
     consume(Chan, Q, Msgs),
 
+    rabbit_ct_broker_helpers:clear_policy(Config, 0, PolicyName),
     rabbit_ct_client_helpers:close_channel(Chan),
     ok.
 
@@ -418,3 +432,7 @@ make_exchange_name(Config, Suffix) ->
 make_queue_name(Config, Suffix) ->
     B = rabbit_ct_helpers:get_config(Config, test_resource_name),
     erlang:list_to_binary("q-" ++ B ++ "-" ++ Suffix).
+
+make_policy_name(Config, Suffix) ->
+    B = rabbit_ct_helpers:get_config(Config, test_resource_name),
+    erlang:list_to_binary("p-" ++ B ++ "-" ++ Suffix).