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

Configure FLUs and chains with "rc.d" style configuration #56

Merged
slfritchie merged 43 commits from slf/flu-config-rcd-style into master 2015-12-18 06:46:05 +00:00
Conversation 6 Commits 43 Files changed 32 +9 -8
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 95e2df304e - Show all commits

17
src/machi_lifecycle_mgr.erl
View file

@ -381,6 +381,11 @@ bootstrap_chain2(#chain_def_v1{name=NewChainName, mode=NewCMode,
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};
chain_bad_state=Else ->
lager:error("Attempt to bootstrap chain ~w via FLU ~w "
"failed (no retries): ~w (defn ~w)\n",
[NewChainName, FLU, Else, CD]),
Else;
Else -> Else ->
lager:error("Attempt to bootstrap chain ~w via FLU ~w " lager:error("Attempt to bootstrap chain ~w via FLU ~w "
"failed: ~w (defn ~w)\n", "failed: ~w (defn ~w)\n",
@ -410,7 +415,7 @@ set_chain_members(OldChainName, NewChainName, OldCMode,
NewCMode, NewCMode,
MembersDict, NewWitnesses); MembersDict, NewWitnesses);
true -> true ->
chain_bad_arg chain_bad_state
end. end.
do_process_pending(S) -> do_process_pending(S) ->
@ -513,9 +518,8 @@ process_pending_chain({File, CD}, S) ->
%% the return of process_pending_chain2(), we have a race %% the return of process_pending_chain2(), we have a race
%% window if this process crashes. %% window if this process crashes.
case bootstrap_chain(CD, FLU) of case bootstrap_chain(CD, FLU) of
{ok, AddedFLUs, RemovedFLUs} -> {ok, _AddedFLUs, RemovedFLUs} ->
process_pending_chain2(File, CD, process_pending_chain2(File, CD, RemovedFLUs, S);
AddedFLUs, RemovedFLUs, S);
Else -> Else ->
lager:error("Pending chain config file ~s " lager:error("Pending chain config file ~s "
"has failed (~w), rejected\n", "has failed (~w), rejected\n",
@ -531,7 +535,7 @@ process_pending_chain({File, CD}, S) ->
S S
end. end.
process_pending_chain2(File, CD, _AddedFLUs, RemovedFLUs, S) -> process_pending_chain2(File, CD, RemovedFLUs, S) ->
LocalRemovedFLUs = [FLU || FLU <- RemovedFLUs, LocalRemovedFLUs = [FLU || FLU <- RemovedFLUs,
flu_config_exists(FLU, S)], flu_config_exists(FLU, S)],
case LocalRemovedFLUs of case LocalRemovedFLUs of
@ -551,12 +555,9 @@ process_pending_chain2(File, CD, _AddedFLUs, RemovedFLUs, S) ->
FLU_str = atom_to_list(FLU), FLU_str = atom_to_list(FLU),
MyPreserveDir = PreserveDir ++ "/" ++ FLU_str ++ "." ++ Suffix, MyPreserveDir = PreserveDir ++ "/" ++ FLU_str ++ "." ++ Suffix,
ok = filelib:ensure_dir(MyPreserveDir ++ "/unused"), ok = filelib:ensure_dir(MyPreserveDir ++ "/unused"),
io:format(user, "PRE ~s\n", [MyPreserveDir]),
_ = file:make_dir(MyPreserveDir), _ = file:make_dir(MyPreserveDir),
io:format(user, "PRE rename ~s ~s\n", [ConfigDir ++ "/" ++ FLU_str, MyPreserveDir ++ "/" ++ FLU_str ++ ".config"]),
_ = file:rename(ConfigDir ++ "/" ++ FLU_str, _ = file:rename(ConfigDir ++ "/" ++ FLU_str,
MyPreserveDir ++ "/" ++ FLU_str ++ ".config"), MyPreserveDir ++ "/" ++ FLU_str ++ ".config"),
io:format(user, "PRE rename ~s ~s\n", [FluDataDir ++ "/" ++ FLU_str, MyPreserveDir ++ "/" ++ FLU_str ++ ".data"]),
_ = file:rename(FluDataDir ++ "/" ++ FLU_str, _ = file:rename(FluDataDir ++ "/" ++ FLU_str,
MyPreserveDir ++ "/" ++ FLU_str ++ ".data"), MyPreserveDir ++ "/" ++ FLU_str ++ ".data"),
ok ok