diff options
| author | Daniil Fedotov <hairyhum@gmail.com> | 2019-01-16 13:43:34 +0400 |
|---|---|---|
| committer | Daniil Fedotov <hairyhum@gmail.com> | 2019-01-16 13:43:34 +0400 |
| commit | 65babdb30055dfcb827e077e80af8b9abddff905 (patch) | |
| tree | 756e9702827ac5f07a5328bb92291e81dd607d36 /src | |
| parent | 13646d73cd1bdffc496908f8b6256514f07a07a5 (diff) | |
| download | rabbitmq-server-git-65babdb30055dfcb827e077e80af8b9abddff905.tar.gz | |
Only remove durable bindings for durable queues.
Non-durable queues and bindings are not on disk anyways.
This should be changes when moving to feature flags.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_binding.erl | 7 | ||||
| -rw-r--r-- | src/rabbit_upgrade_functions.erl | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/rabbit_binding.erl b/src/rabbit_binding.erl index 14398bd4c9..bb1c754b5c 100644 --- a/src/rabbit_binding.erl +++ b/src/rabbit_binding.erl @@ -256,12 +256,7 @@ remove(Src, Dst, B, ActingUser) -> remove_default_exchange_binding_rows_of(Dst = #resource{}) -> case rabbit_binding:implicit_for_destination(Dst) of [Binding] -> - mnesia:dirty_delete(rabbit_route, Binding), - mnesia:dirty_delete(rabbit_durable_route, Binding), - mnesia:dirty_delete(rabbit_semi_durable_route, Binding), - - RevBinding = rabbit_binding:reverse_binding(Binding), - mnesia:dirty_delete(rabbit_reverse_route, RevBinding); + mnesia:dirty_delete(rabbit_durable_route, Binding); _ -> %% no binding to remove or %% a competing tx has beaten us to it? diff --git a/src/rabbit_upgrade_functions.erl b/src/rabbit_upgrade_functions.erl index a4c1f06de7..6be812dad3 100644 --- a/src/rabbit_upgrade_functions.erl +++ b/src/rabbit_upgrade_functions.erl @@ -659,7 +659,7 @@ exchange_options(Table) -> operator_policy, decorators, options]). remove_explicit_default_exchange_bindings() -> - Tab = rabbit_queue, + Tab = rabbit_durable_queue, rabbit_table:wait([Tab]), %% Default exchange bindings are now implicit %% (not stored in the route tables). |