yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(emqx_mgmt_data_backup): upgrade raw conf before validating and importing

This commit is contained in:
Serge Tupchii 2023-10-30 15:57:13 +02:00
parent f463eff02d
commit d1cd5dd817
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/emqx_management/src/emqx_mgmt_data_backup.erl
View File

@ -462,11 +462,12 @@ import_cluster_hocon(BackupDir, Opts) ->
case filelib:is_regular(HoconFileName) of case filelib:is_regular(HoconFileName) of
true -> true ->
{ok, RawConf} = hocon:files([HoconFileName]), {ok, RawConf} = hocon:files([HoconFileName]),
{ok, _} = validate_cluster_hocon(RawConf), RawConf1 = upgrade_raw_conf(emqx_conf:schema_module(), RawConf),
{ok, _} = validate_cluster_hocon(RawConf1),
maybe_print("Importing cluster configuration...~n", [], Opts), maybe_print("Importing cluster configuration...~n", [], Opts),
%% At this point, when all validations have been passed, we want to log errors (if any) %% At this point, when all validations have been passed, we want to log errors (if any)
%% but proceed with the next items, instead of aborting the whole import operation %% but proceed with the next items, instead of aborting the whole import operation
do_import_conf(RawConf, Opts); do_import_conf(RawConf1, Opts);
false -> false ->
maybe_print("No cluster configuration to be imported.~n", [], Opts), maybe_print("No cluster configuration to be imported.~n", [], Opts),
?SLOG(info, #{ ?SLOG(info, #{
@ -476,6 +477,16 @@ import_cluster_hocon(BackupDir, Opts) ->
#{} #{}
end. end.
upgrade_raw_conf(SchemaMod, RawConf) ->
_ = SchemaMod:module_info(),
case erlang:function_exported(SchemaMod, upgrade_raw_conf, 1) of
true ->
%% TODO make it a schema module behaviour in hocon_schema
apply(SchemaMod, upgrade_raw_conf, [RawConf]);
false ->
RawConf
end.
read_data_files(RawConf) -> read_data_files(RawConf) ->
DataDir = bin(emqx:data_dir()), DataDir = bin(emqx:data_dir()),
{ok, Cwd} = file:get_cwd(), {ok, Cwd} = file:get_cwd(),