greg/machi
1
0
Fork 0
Code Issues 11 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Modify chain mostly works, 2 TODOs remain

Browse source
This commit is contained in:
Scott Lystig Fritchie 2015-12-09 18:17:26 +09:00
parent 2871f8397c
commit cd9bf9eeab
1 changed files with 67 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
src/machi_lifecycle_mgr.erl
View file

@ -350,27 +350,34 @@ bootstrap_chain2(CD, FLU, 0) ->
lager:warning("Failed all attempts to bootstrap chain ~w via FLU ~w ", lager:warning("Failed all attempts to bootstrap chain ~w via FLU ~w ",
[CD,FLU]), [CD,FLU]),
failed; failed;
bootstrap_chain2(#chain_def_v1{name=NewChainName, mode=CMode, full=Full, bootstrap_chain2(#chain_def_v1{name=NewChainName, mode=NewCMode,
witnesses=Witnesses, props=Props}=CD, full=Full, witnesses=Witnesses,
old_all=ReqOldAll, old_witnesses=ReqOldWitnesses,
props=_Props}=CD,
FLU, N) -> FLU, N) ->
All_p_srvrs = Witnesses ++ Full, All_p_srvrs = Witnesses ++ Full,
L = [{Name, P_srvr} || #p_srvr{name=Name}=P_srvr <- All_p_srvrs], L = [{Name, P_srvr} || #p_srvr{name=Name}=P_srvr <- All_p_srvrs],
MembersDict = orddict:from_list(L), MembersDict = orddict:from_list(L),
NewAll_list = [Name || #p_srvr{name=Name} <- All_p_srvrs],
NewWitnesses_list = [Name || #p_srvr{name=Name} <- Witnesses],
Mgr = machi_chain_manager1:make_chmgr_regname(FLU), Mgr = machi_chain_manager1:make_chmgr_regname(FLU),
PStore = machi_flu1:make_projection_server_regname(FLU), PStore = machi_flu1:make_projection_server_regname(FLU),
{ok, #projection_v1{epoch_number=OldEpoch, chain_name=OldChainName, {ok, #projection_v1{epoch_number=OldEpoch, chain_name=OldChainName,
mode=OldCMode,
all_members=OldAll_list, witnesses=OldWitnesses}} = all_members=OldAll_list, witnesses=OldWitnesses}} =
machi_projection_store:read_latest_projection(PStore, private), machi_projection_store:read_latest_projection(PStore, private),
NewAll_list = [Name || #p_srvr{name=Name} <- All_p_srvrs], case set_chain_members(OldChainName, NewChainName, OldCMode,
case set_chain_members(OldChainName, NewChainName, ReqOldAll, ReqOldWitnesses,
OldAll_list, OldWitnesses, OldAll_list, OldWitnesses,
NewAll_list, NewWitnesses, NewAll_list, Witnesses,
Mgr, NewChainName, OldEpoch, Mgr, NewChainName, OldEpoch,
CMode, MembersDict, NewWitnesses) of NewCMode, MembersDict, NewWitnesses_list) of
ok -> ok ->
lager:info("Bootstrapped chain ~w via FLU ~w to " lager:info("Bootstrapped chain ~w via FLU ~w to "
"mode=~w all=~w witnesses=~w\n", "mode=~w all=~w witnesses=~w\n",
[NewChainName, FLU, CMode, All_list, NewWitnesses]), [NewChainName, FLU, NewCMode,
NewAll_list, NewWitnesses_list]),
AddedFLUs = NewAll_list -- OldAll_list, AddedFLUs = NewAll_list -- OldAll_list,
RemovedFLUs = OldAll_list -- NewAll_list, RemovedFLUs = OldAll_list -- NewAll_list,
{ok, AddedFLUs, RemovedFLUs}; {ok, AddedFLUs, RemovedFLUs};
@ -382,15 +389,25 @@ bootstrap_chain2(#chain_def_v1{name=NewChainName, mode=CMode, full=Full,
bootstrap_chain2(CD, FLU, N-1) bootstrap_chain2(CD, FLU, N-1)
end. end.
set_chain_members(OldChainName, NewChainName, set_chain_members(OldChainName, NewChainName, OldCMode,
ReqOldAll, ReqOldWitnesses,
OldAll_list, OldWitnesses, NewAll_list, NewWitnesses, OldAll_list, OldWitnesses, NewAll_list, NewWitnesses,
Mgr, ChainName, OldEpoch, CMode, MembersDict, Props) -> Mgr, ChainName, OldEpoch, NewCMode, MembersDict, _Props) ->
if OldChainName == NewChainName, if OldChainName == NewChainName, OldCMode == NewCMode,
OldAll_list == NewAll_list, OldWitnesses == NewWitnesses -> OldAll_list == NewAll_list, OldWitnesses == NewWitnesses ->
%% The chain's current definition at this FLU is already what we
%% want. Let's pretend that we sent the command and that it was
%% successful.
ok; ok;
OldEpoch == 0 orelse (OldChainName == NewChainName) -> OldEpoch == 0 orelse (OldChainName == NewChainName andalso
OldCMode == NewCMode andalso
ReqOldAll == OldAll_list andalso
ReqOldWitnesses == OldWitnesses) ->
%% The old epoch is 0 (no chain defined) or else the prerequisites
%% for our chain change request are indeed matched by the FLU's
%% current private projection.
machi_chain_manager1:set_chain_members(Mgr, ChainName, OldEpoch, machi_chain_manager1:set_chain_members(Mgr, ChainName, OldEpoch,
CMode, NewCMode,
MembersDict, NewWitnesses); MembersDict, NewWitnesses);
true -> true ->
chain_bad_arg chain_bad_arg
@ -440,22 +457,28 @@ process_pending_flu({File, P}, S) ->
_ = move_to_rejected(File, S), _ = move_to_rejected(File, S),
S; S;
true -> true ->
{ok, SupPid} = machi_flu_psup:start_flu_package(P), case machi_flu_psup:start_flu_package(P) of
{ok, SupPid} ->
lager:info("Started FLU ~w with supervisor pid ~p\n", lager:info("Started FLU ~w with supervisor pid ~p\n",
[FLU, SupPid]), [FLU, SupPid]),
_ = move_to_flu_config(FLU, File, S), _ = move_to_flu_config(FLU, File, S),
S;
Else ->
lager:error("Start FLU ~w failed: ~p\n", [FLU, Else]),
_ = move_to_rejected(File, S),
S S
end
end. end.
process_pending_chains(P_Chains, S) -> process_pending_chains(P_Chains, S) ->
lists:foldl(fun process_pending_chain/2, S, P_Chains). lists:foldl(fun process_pending_chain/2, S, P_Chains).
process_pending_chain({File, CD}, S) -> process_pending_chain({File, CD}, S) ->
#chain_def_v1{name=Name, mode=CMode, full=Full, witnesses=Witnesses} = CD, #chain_def_v1{full=Full, witnesses=Witnesses} = CD,
case sanitize_chain_def_records([CD]) of case sanitize_chain_def_records([CD]) of
[CD] -> [CD] ->
RunningFLUs = get_local_running_flus(), RunningFLUs = get_local_running_flus(),
AllNames = [Name || #p_srvr{name=Name} <- Full ++ Witnesses], AllNames = [FLUName || #p_srvr{name=FLUName} <- Full ++ Witnesses],
case ordsets:intersection(ordsets:from_list(AllNames), case ordsets:intersection(ordsets:from_list(AllNames),
ordsets:from_list(RunningFLUs)) of ordsets:from_list(RunningFLUs)) of
[] -> [] ->
@ -488,10 +511,27 @@ process_pending_chain({File, CD}, S) ->
S S
end. end.
process_pending_chain2(File, CD, LocalFLUs, AddedFLUs, RemovedFLUs, S) -> process_pending_chain2(File, CD, LocalFLUs, _AddedFLUs, RemovedFLUs, S) ->
%% AddedFLUs: no any extra work. %% AddedFLUs: no any extra work.
%% RemovedFLUs: Stop the FLU, config -> j-i-c, data -> j-i-c %% RemovedFLUs: Stop the FLU, config -> j-i-c, data -> j-i-c
io:format(user, "TODO: ~s LINE ~p\n", [?MODULE, ?LINE]), case ordsets:intersection(ordsets:from_list(LocalFLUs),
ordsets:from_list(RemovedFLUs)) of
[] ->
ok;
LocalRemovedFLUs ->
%% Sleep for a little bit to allow HC to settle.
timer:sleep(3000),
[begin
%% We may be retrying this, so be liberal with any pattern
%% matching on return values.
_ = machi_flu_psup:stop_flu_package(FLU),
io:format(user, "TODO: move config ~s LINE ~p\n", [?MODULE, ?LINE]),
io:format(user, "TODO: move data ~s LINE ~p\n", [?MODULE, ?LINE]),
ok
end || FLU <- LocalRemovedFLUs]
end,
#chain_def_v1{name=Name} = CD,
_ = move_to_chain_config(Name, File, S),
S. S.
process_bad_files(Files, S) -> process_bad_files(Files, S) ->
@ -510,3 +550,9 @@ move_to_flu_config(FLU, File, S) ->
Dst = get_flu_config_dir(S), Dst = get_flu_config_dir(S),
ok = file:rename(File, Dst ++ "/" ++ atom_to_list(FLU)), ok = file:rename(File, Dst ++ "/" ++ atom_to_list(FLU)),
S. S.
move_to_chain_config(Name, File, S) ->
lager:info("Creating chain config file ~w\n", [Name]),
Dst = get_chain_config_dir(S),
ok = file:rename(File, Dst ++ "/" ++ atom_to_list(Name)),
S.