diff options
| author | Michael Klishin <klishinm@vmware.com> | 2022-06-29 17:09:51 +0400 |
|---|---|---|
| committer | Michael Klishin <klishinm@vmware.com> | 2022-06-29 17:09:51 +0400 |
| commit | 75a0248a039bdbda5f8f18aaae9415304937c272 (patch) | |
| tree | 3745b2add9708dfb957c6f4bc7efa5383cf876ce | |
| parent | 088b7a63a9ecb6b356257297e45fe6d75c4aa3c6 (diff) | |
| download | rabbitmq-server-git-rabbitmq-server-3386.tar.gz | |
Consider all binding/route tables in rabbit_binding:list_between/2rabbitmq-server-3386
| -rw-r--r-- | deps/rabbit/src/rabbit_binding.erl | 7 | ||||
| -rw-r--r-- | deps/rabbitmq_consistent_hash_exchange/src/rabbit_exchange_type_consistent_hash.erl | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/deps/rabbit/src/rabbit_binding.erl b/deps/rabbit/src/rabbit_binding.erl index 820fc845a2..3ee5e9efc1 100644 --- a/deps/rabbit/src/rabbit_binding.erl +++ b/deps/rabbit/src/rabbit_binding.erl @@ -317,8 +317,11 @@ list_between(SrcName = #resource{virtual_host = SVH}, DstName = #resource{}) -> destination = DstName, _ = '_'} }, - [B || #route{binding = B} - <- mnesia:match_object(rabbit_route, Route, read)] + + Durable = [B || #route{binding = B} <- mnesia:match_object(rabbit_durable_route, Route, read)], + Transient = [B || #route{binding = B} <- mnesia:match_object(rabbit_route, Route, read)], + SemiDurable = [B || #route{binding = B} <- mnesia:match_object(rabbit_semi_durable_route, Route, read)], + Durable ++ Transient ++ SemiDurable end), lists:filter(fun(#binding{source = S}) -> S =/= ?DEFAULT_EXCHANGE(SVH) diff --git a/deps/rabbitmq_consistent_hash_exchange/src/rabbit_exchange_type_consistent_hash.erl b/deps/rabbitmq_consistent_hash_exchange/src/rabbit_exchange_type_consistent_hash.erl index 606b6ba5af..843919eb6f 100644 --- a/deps/rabbitmq_consistent_hash_exchange/src/rabbit_exchange_type_consistent_hash.erl +++ b/deps/rabbitmq_consistent_hash_exchange/src/rabbit_exchange_type_consistent_hash.erl @@ -193,8 +193,9 @@ policy_changed(_X1, _X2) -> ok. add_binding(transaction, X, B = #binding{source = S, destination = D, key = K}) -> Weight = rabbit_data_coercion:to_integer(K), - rabbit_log:debug("Consistent hashing exchange: adding binding from " - "exchange ~s to destination ~s with routing key '~s'", [rabbit_misc:rs(S), rabbit_misc:rs(D), K]), + rabbit_log:debug("Consistent hashing exchange: adding binding from " + "exchange ~s to destination ~s with routing key '~s'", + [rabbit_misc:rs(S), rabbit_misc:rs(D), K]), case mnesia:read(?HASH_RING_STATE_TABLE, S) of [State0 = #chx_hash_ring{bucket_map = BM0, |