valitydev/riak_test
14
0
Fork 0
mirror of https://github.com/valitydev/riak_test.git synced 2024-11-07 08:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/riak/2.0' into bch-merge-2.0-onto-develop-2.2

Browse Source
This commit is contained in:
Brett Hazen 2016-05-03 11:36:36 -06:00
commit 8abe51a59f
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/rt.erl
View File

@ -143,6 +143,7 @@
upgrade/2, upgrade/2,
upgrade/3, upgrade/3,
versions/0, versions/0,
wait_for_any_webmachine_route/2,
wait_for_cluster_service/2, wait_for_cluster_service/2,
wait_for_cmd/1, wait_for_cmd/1,
wait_for_service/2, wait_for_service/2,
@ -1932,30 +1933,31 @@ wait_for_control(_Vsn, Node) when is_atom(Node) ->
end end
end), end),
lager:info("Waiting for routes to be added to supervisor..."),
%% Wait for routes to be added by supervisor. %% Wait for routes to be added by supervisor.
rt:wait_until(Node, fun(N) -> wait_for_any_webmachine_route(Node, [admin_gui, riak_control_wm_gui]).
case rpc:call(N,
webmachine_router,
get_routes,
[]) of
{badrpc, Error} ->
lager:info("Error was ~p.", [Error]),
false;
Routes ->
case is_control_gui_route_loaded(Routes) of
false ->
false;
_ ->
true
end
end
end).
%% @doc Is the riak_control GUI route loaded? wait_for_any_webmachine_route(Node, Routes) ->
is_control_gui_route_loaded(Routes) -> lager:info("Waiting for routes ~p to be added to webmachine.", [Routes]),
lists:keymember(admin_gui, 2, Routes) orelse lists:keymember(riak_control_wm_gui, 2, Routes). rt:wait_until(Node, fun(N) ->
case rpc:call(N, webmachine_router, get_routes, []) of
{badrpc, Error} ->
lager:info("Error was ~p.", [Error]),
false;
RegisteredRoutes ->
case is_any_route_loaded(Routes, RegisteredRoutes) of
false ->
false;
_ ->
true
end
end
end).
is_any_route_loaded(SearchRoutes, RegisteredRoutes) ->
lists:any(fun(Route) -> is_route_loaded(Route, RegisteredRoutes) end, SearchRoutes).
is_route_loaded(Route, Routes) ->
lists:keymember(Route, 2, Routes).
%% @doc Wait for Riak Control to start on a series of nodes. %% @doc Wait for Riak Control to start on a series of nodes.
wait_for_control(VersionedNodes) when is_list(VersionedNodes) -> wait_for_control(VersionedNodes) when is_list(VersionedNodes) ->