From efef052ec7865e93f9a0135769cd1fe8a39ed1b8 Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Thu, 11 Aug 2022 15:09:10 -0300 Subject: [PATCH 1/3] feat: enable upgrading release from 4.4.X to 4.5.Y When upgrading from 4.4.X, the `install_upgrade` script from 4.4.X is used, which forbids such transition. --- bin/install_upgrade.escript | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/install_upgrade.escript b/bin/install_upgrade.escript index 88268d893..6c27dc49a 100755 --- a/bin/install_upgrade.escript +++ b/bin/install_upgrade.escript @@ -437,6 +437,8 @@ validate_target_version(TargetVersion, TargetNode) -> CurrentVersion = current_release_version(TargetNode), case {get_major_minor_vsn(CurrentVersion), get_major_minor_vsn(TargetVersion)} of {{Major, Minor}, {Major, Minor}} -> ok; + {{<<"4">>, <<"5">>}, {<<"4">>, <<"4">>}} -> ok; + {{<<"4">>, <<"4">>}, {<<"4">>, <<"5">>}} -> ok; _ -> ?INFO("Cannot upgrade/downgrade to ~s from ~s~n" "We only support relup between patch versions", From 98da31e8b2253248a9e48c84dbbcae116e1b24b8 Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Thu, 11 Aug 2022 16:04:43 -0300 Subject: [PATCH 2/3] feat: enable importing backup json for 4.5 --- apps/emqx_management/src/emqx_management.app.src | 2 +- apps/emqx_management/src/emqx_mgmt_data_backup.erl | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/emqx_management/src/emqx_management.app.src b/apps/emqx_management/src/emqx_management.app.src index 95a692bfd..932ef704e 100644 --- a/apps/emqx_management/src/emqx_management.app.src +++ b/apps/emqx_management/src/emqx_management.app.src @@ -1,6 +1,6 @@ {application, emqx_management, [{description, "EMQ X Management API and CLI"}, - {vsn, "4.4.6"}, % strict semver, bump manually! + {vsn, "4.4.7"}, % strict semver, bump manually! {modules, []}, {registered, [emqx_management_sup]}, {applications, [kernel,stdlib,emqx_plugin_libs,minirest]}, diff --git a/apps/emqx_management/src/emqx_mgmt_data_backup.erl b/apps/emqx_management/src/emqx_mgmt_data_backup.erl index 87663f2be..9ea25c7ed 100644 --- a/apps/emqx_management/src/emqx_mgmt_data_backup.erl +++ b/apps/emqx_management/src/emqx_mgmt_data_backup.erl @@ -939,6 +939,8 @@ is_version_supported2("4.3") -> true; is_version_supported2("4.4") -> true; +is_version_supported2("4.5") -> + true; is_version_supported2(Version) -> case re:run(Version, "^4.[02].\\d+$", [{capture, none}]) of match -> From fc9e802b26db7d1f7c8ddf7a6da96cfc303d0984 Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Fri, 12 Aug 2022 09:10:59 -0300 Subject: [PATCH 3/3] chore: bump release version, app vsns, appups --- apps/emqx_rule_engine/src/emqx_rule_engine.app.src | 2 +- apps/emqx_rule_engine/src/emqx_rule_engine.appup.src | 6 ++++-- include/emqx_release.hrl | 2 +- src/emqx.app.src | 2 +- src/emqx.appup.src | 10 ++++++++-- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine.app.src b/apps/emqx_rule_engine/src/emqx_rule_engine.app.src index fa394dfcb..31d0a79a1 100644 --- a/apps/emqx_rule_engine/src/emqx_rule_engine.app.src +++ b/apps/emqx_rule_engine/src/emqx_rule_engine.app.src @@ -1,6 +1,6 @@ {application, emqx_rule_engine, [{description, "EMQ X Rule Engine"}, - {vsn, "4.4.7"}, % strict semver, bump manually! + {vsn, "4.4.8"}, % strict semver, bump manually! {modules, []}, {registered, [emqx_rule_engine_sup, emqx_rule_registry]}, {applications, [kernel,stdlib,rulesql,getopt]}, diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine.appup.src b/apps/emqx_rule_engine/src/emqx_rule_engine.appup.src index 51e1181c2..6ddc249b3 100644 --- a/apps/emqx_rule_engine/src/emqx_rule_engine.appup.src +++ b/apps/emqx_rule_engine/src/emqx_rule_engine.appup.src @@ -1,7 +1,8 @@ %% -*- mode: erlang -*- %% Unless you know what you are doing, DO NOT edit manually!! {VSN, - [{"4.4.6",[{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]}]}, + [{"4.4.7",[{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]}]}, + {"4.4.6",[{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]}]}, {"4.4.5", [{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]}, {load_module,emqx_rule_validator,brutal_purge,soft_purge,[]}, @@ -72,7 +73,8 @@ {load_module,emqx_rule_runtime,brutal_purge,soft_purge,[]}, {load_module,emqx_rule_engine_api,brutal_purge,soft_purge,[]}]}, {<<".*">>,[]}], - [{"4.4.6",[{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]}]}, + [{"4.4.7",[{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]}]}, + {"4.4.6",[{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]}]}, {"4.4.5", [{load_module,emqx_rule_registry,brutal_purge,soft_purge,[]}, {load_module,emqx_rule_validator,brutal_purge,soft_purge,[]}, diff --git a/include/emqx_release.hrl b/include/emqx_release.hrl index 9a1745941..261b38af0 100644 --- a/include/emqx_release.hrl +++ b/include/emqx_release.hrl @@ -29,7 +29,7 @@ -ifndef(EMQX_ENTERPRISE). --define(EMQX_RELEASE, {opensource, "4.4.7"}). +-define(EMQX_RELEASE, {opensource, "4.4.8"}). -else. diff --git a/src/emqx.app.src b/src/emqx.app.src index d5d335e45..01bcf5ab2 100644 --- a/src/emqx.app.src +++ b/src/emqx.app.src @@ -6,7 +6,7 @@ %% the emqx `release' version, which in turn is comprised of several %% apps, one of which is this. See `emqx_release.hrl' for more %% info. - {vsn, "4.4.7"}, % strict semver, bump manually! + {vsn, "4.4.8"}, % strict semver, bump manually! {modules, []}, {registered, []}, {applications, [ kernel diff --git a/src/emqx.appup.src b/src/emqx.appup.src index 7097216ef..744c9b076 100644 --- a/src/emqx.appup.src +++ b/src/emqx.appup.src @@ -1,7 +1,10 @@ %% -*- mode: erlang -*- %% Unless you know what you are doing, DO NOT edit manually!! {VSN, - [{"4.4.6", + [{"4.4.7", + [{load_module,emqx_app,brutal_purge,soft_purge,[]}, + {load_module,emqx_relup,brutal_purge,soft_purge,[]}]}, + {"4.4.6", [{load_module,emqx_app,brutal_purge,soft_purge,[]}, {load_module,emqx_relup,brutal_purge,soft_purge,[]}]}, {"4.4.5", @@ -162,7 +165,10 @@ {load_module,emqx_message,brutal_purge,soft_purge,[]}, {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]}, {<<".*">>,[]}], - [{"4.4.6", + [{"4.4.7", + [{load_module,emqx_app,brutal_purge,soft_purge,[]}, + {load_module,emqx_relup,brutal_purge,soft_purge,[]}]}, + {"4.4.6", [{load_module,emqx_app,brutal_purge,soft_purge,[]}, {load_module,emqx_relup,brutal_purge,soft_purge,[]}]}, {"4.4.5",