root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Handle keys for which node name extraction returned an error

This commit is contained in:
Michael Klishin 2018-09-10 18:02:41 +02:00
parent b96bcf78fa
commit c681bdbb10
2 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deps/rabbitmq_peer_discovery_etcd/src/rabbit_peer_discovery_etcd.erl vendored
View File

@ -190,7 +190,11 @@ node_path(Map) ->
extract_nodes([], Nodes) -> Nodes;
extract_nodes([H|T], Nodes) ->
M = ?CONFIG_MODULE:config_map(?BACKEND_CONFIG_KEY),
extract_nodes(T, lists:append(Nodes, [get_node_from_key(maps:get(<<"key">>, H), M)])).
ToAppend = case get_node_from_key(maps:get(<<"key">>, H), M) of
{error, none} -> [];
Name -> [Name]
end,
extract_nodes(T, lists:append(Nodes, ToAppend)).
%% @doc Return the list of erlang nodes
%% @end

37
deps/rabbitmq_peer_discovery_etcd/test/rabbitmq_peer_discovery_etcd_SUITE.erl vendored
View File

@ -39,7 +39,8 @@ groups() ->
get_node_from_key_case2_test,
get_node_from_key_case3_test,
list_nodes_without_existing_directory_test,
issue14_extract_nodes_test
issue14_extract_nodes_case1_test,
issue14_extract_nodes_case2_test
]}
].
@ -150,7 +151,7 @@ list_nodes_without_existing_directory_test(_Config) ->
rabbit_peer_discovery_etcd:list_nodes(),
?assert(meck:validate(rabbit_peer_discovery_httpc)).
issue14_extract_nodes_test(_Config) ->
issue14_extract_nodes_case1_test(_Config) ->
Values = #{<<"action">> => <<"get">>,
<<"node">> =>
#{<<"createdIndex">> => 1031,<<"dir">> => true,
@ -165,3 +166,35 @@ issue14_extract_nodes_test(_Config) ->
<<"value">> => <<"enabled">>}]}},
Expectation = ['rabbit@devops35-2'],
?assertEqual(Expectation, rabbit_peer_discovery_etcd:extract_nodes(Values)).
issue14_extract_nodes_case2_test(_Config) ->
Values = #{<<"action">> => <<"get">>,
<<"node">> =>
#{<<"createdIndex">> => 1031,<<"dir">> => true,
<<"key">> => <<"/nct/co/12.0.4/config/mq/co/nodes">>,
<<"modifiedIndex">> => 1031,
<<"nodes">> =>
[
#{<<"createdIndex">> => 1418809,
<<"expiration">> => <<"2018-08-20T11:53:58.944379602Z">>,
<<"key">> =>
<<"/nct/co/12.0.4/config/mq/co/nodes/rabbit@devops35-1">>,
<<"modifiedIndex">> => 1418809,<<"ttl">> => 26,
<<"value">> => <<"enabled">>},
#{<<"createdIndex">> => 1418809,
<<"expiration">> => <<"2018-08-20T11:53:58.944379602Z">>,
<<"key">> =>
<<"/nct/co/12.0.4/config/mq/co/nodes/rabbit@devops35-2">>,
<<"modifiedIndex">> => 1418809,<<"ttl">> => 26,
<<"value">> => <<"enabled">>},
#{<<"createdIndex">> => 1418809,
<<"expiration">> => <<"2018-08-20T11:53:58.944379602Z">>,
<<"key">> =>
<<"/nct/co/12.0.4/config/mq/co/no/matches/found/here">>,
<<"modifiedIndex">> => 1418809,<<"ttl">> => 26,
<<"value">> => <<"enabled">>}]}},
Expectation = ['rabbit@devops35-1', 'rabbit@devops35-2'],
?assertEqual(lists:usort(Expectation),
lists:usort(rabbit_peer_discovery_etcd:extract_nodes(Values))).