diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-04-06 07:12:16 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-04-06 07:12:16 +0300 |
| commit | 4b69f48b772590af7b75699c60f7bef4fbeac4c8 (patch) | |
| tree | d883240bf1ffeabc5b77d0f2fd05220cc6e86396 | |
| parent | beac7417153408cbbfa957d6b1ad0ca85dd948a7 (diff) | |
| parent | 0b0308829c716d3226c4d71efefe4d0b5f57473c (diff) | |
| download | rabbitmq-server-git-4b69f48b772590af7b75699c60f7bef4fbeac4c8.tar.gz | |
Merge branch 'stable'
| -rw-r--r-- | src/rabbit_queue_master_location_misc.erl | 4 | ||||
| -rw-r--r-- | test/queue_master_location_SUITE.erl | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/rabbit_queue_master_location_misc.erl b/src/rabbit_queue_master_location_misc.erl index 2cc6d515f4..0b9efdd6fc 100644 --- a/src/rabbit_queue_master_location_misc.erl +++ b/src/rabbit_queue_master_location_misc.erl @@ -63,8 +63,8 @@ get_location(Queue=#amqqueue{})-> end. get_location_mod_by_args(#amqqueue{arguments=Args}) -> - case proplists:lookup(<<"x-queue-master-locator">> , Args) of - {<<"x-queue-master-locator">> , Strategy} -> + case rabbit_misc:table_lookup(Args, <<"x-queue-master-locator">>) of + {_Type, Strategy} -> case rabbit_queue_location_validator:validate_strategy(Strategy) of Reply = {ok, _CB} -> Reply; Error -> Error diff --git a/test/queue_master_location_SUITE.erl b/test/queue_master_location_SUITE.erl index 8f9433beb4..8d056d3fe9 100644 --- a/test/queue_master_location_SUITE.erl +++ b/test/queue_master_location_SUITE.erl @@ -112,7 +112,7 @@ declare_args(Config) -> setup_test_environment(Config), unset_location_config(Config), QueueName = rabbit_misc:r(<<"/">>, queue, Q= <<"qm.test">>), - Args = [{<<"x-queue-master-locator">>, <<"min-masters">>}], + Args = [{<<"x-queue-master-locator">>, longstr, <<"min-masters">>}], declare(Config, QueueName, false, false, Args, none), verify_min_master(Config, Q). @@ -140,7 +140,7 @@ declare_config(Config) -> calculate_min_master(Config) -> setup_test_environment(Config), QueueName = rabbit_misc:r(<<"/">>, queue, Q= <<"qm.test">>), - Args = [{<<"x-queue-master-locator">>, <<"min-masters">>}], + Args = [{<<"x-queue-master-locator">>, longstr, <<"min-masters">>}], declare(Config, QueueName, false, false, Args, none), verify_min_master(Config, Q), ok. @@ -148,7 +148,7 @@ calculate_min_master(Config) -> calculate_random(Config) -> setup_test_environment(Config), QueueName = rabbit_misc:r(<<"/">>, queue, Q= <<"qm.test">>), - Args = [{<<"x-queue-master-locator">>, <<"random">>}], + Args = [{<<"x-queue-master-locator">>, longstr, <<"random">>}], declare(Config, QueueName, false, false, Args, none), verify_random(Config, Q), ok. @@ -156,7 +156,7 @@ calculate_random(Config) -> calculate_client_local(Config) -> setup_test_environment(Config), QueueName = rabbit_misc:r(<<"/">>, queue, Q= <<"qm.test">>), - Args = [{<<"x-queue-master-locator">>, <<"client-local">>}], + Args = [{<<"x-queue-master-locator">>, longstr, <<"client-local">>}], declare(Config, QueueName, false, false, Args, none), verify_client_local(Config, Q), ok. @@ -252,6 +252,7 @@ declare(Config, QueueName, Durable, AutoDelete, Args, Owner) -> verify_min_master(Config, Q) -> Node = rabbit_ct_broker_helpers:get_node_config(Config, 0, nodename), MinMaster = min_master_node(Config), + ct:pal("Expecting min master ~p~n", [MinMaster]), {ok, MinMaster} = rpc:call(Node, rabbit_queue_master_location_misc, lookup_master, [Q, ?DEFAULT_VHOST_PATH]). |