diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | src/rabbit_queue_master_location_misc.erl | 6 | ||||
| -rw-r--r-- | test/queue_master_location_SUITE.erl | 12 |
3 files changed, 12 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore index cbbdafe29e..8683f1521d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ .*.sw? *.beam *.coverdata +MNesiaCore.* /.erlang.mk/ /cover/ /debug/ diff --git a/src/rabbit_queue_master_location_misc.erl b/src/rabbit_queue_master_location_misc.erl index bb2329b958..02bc9387ef 100644 --- a/src/rabbit_queue_master_location_misc.erl +++ b/src/rabbit_queue_master_location_misc.erl @@ -93,5 +93,9 @@ get_location_mod_by_config(#amqqueue{}) -> end. all_nodes(Queue = #amqqueue{}) -> - {MNode, SNodes} = rabbit_mirror_queue_misc:suggested_queue_nodes(Queue), + handle_suggested_queue_nodes(rabbit_mirror_queue_misc:suggested_queue_nodes(Queue)). + +handle_suggested_queue_nodes({MNode, []}) -> + rabbit_nodes:all_running(); +handle_suggested_queue_nodes({MNode, SNodes}) -> [MNode | SNodes]. diff --git a/test/queue_master_location_SUITE.erl b/test/queue_master_location_SUITE.erl index 8bd19639d9..4cfaa5f2c2 100644 --- a/test/queue_master_location_SUITE.erl +++ b/test/queue_master_location_SUITE.erl @@ -112,7 +112,7 @@ end_per_testcase(Testcase, Config) -> declare_args(Config) -> setup_test_environment(Config), unset_location_config(Config), - QueueName = rabbit_misc:r(<<"/">>, queue, Q= <<"qm.test">>), + QueueName = rabbit_misc:r(<<"/">>, queue, Q = <<"qm.test">>), Args = [{<<"x-queue-master-locator">>, longstr, <<"min-masters">>}], declare(Config, QueueName, false, false, Args, none), verify_min_master(Config, Q). @@ -121,14 +121,14 @@ declare_policy(Config) -> setup_test_environment(Config), unset_location_config(Config), set_location_policy(Config, ?POLICY, <<"min-masters">>), - QueueName = rabbit_misc:r(<<"/">>, queue, Q= <<"qm.test">>), + QueueName = rabbit_misc:r(<<"/">>, queue, Q = <<"qm.test">>), declare(Config, QueueName, false, false, _Args=[], none), verify_min_master(Config, Q). declare_config(Config) -> setup_test_environment(Config), set_location_config(Config, <<"min-masters">>), - QueueName = rabbit_misc:r(<<"/">>, queue, Q= <<"qm.test">>), + QueueName = rabbit_misc:r(<<"/">>, queue, Q = <<"qm.test">>), declare(Config, QueueName, false, false, _Args=[], none), verify_min_master(Config, Q), unset_location_config(Config), @@ -140,7 +140,7 @@ declare_config(Config) -> calculate_min_master(Config) -> setup_test_environment(Config), - QueueName = rabbit_misc:r(<<"/">>, queue, Q= <<"qm.test">>), + QueueName = rabbit_misc:r(<<"/">>, queue, Q = <<"qm.test">>), Args = [{<<"x-queue-master-locator">>, longstr, <<"min-masters">>}], declare(Config, QueueName, false, false, Args, none), verify_min_master(Config, Q), @@ -148,7 +148,7 @@ calculate_min_master(Config) -> calculate_random(Config) -> setup_test_environment(Config), - QueueName = rabbit_misc:r(<<"/">>, queue, Q= <<"qm.test">>), + QueueName = rabbit_misc:r(<<"/">>, queue, Q = <<"qm.test">>), Args = [{<<"x-queue-master-locator">>, longstr, <<"random">>}], declare(Config, QueueName, false, false, Args, none), verify_random(Config, Q), @@ -156,7 +156,7 @@ calculate_random(Config) -> calculate_client_local(Config) -> setup_test_environment(Config), - QueueName = rabbit_misc:r(<<"/">>, queue, Q= <<"qm.test">>), + QueueName = rabbit_misc:r(<<"/">>, queue, Q = <<"qm.test">>), Args = [{<<"x-queue-master-locator">>, longstr, <<"client-local">>}], declare(Config, QueueName, false, false, Args, none), verify_client_local(Config, Q), |