From 514519da33a7eb34e68f964d659ce40289571ee0 Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Wed, 21 Sep 2022 13:23:26 +0200
Subject: [PATCH 1/8] docs: Add v4.3.22 in CHANGES-4.3.md

---
 CHANGES-4.3.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGES-4.3.md b/CHANGES-4.3.md
index 55882077e..2e2f5157c 100644
--- a/CHANGES-4.3.md
+++ b/CHANGES-4.3.md
@@ -10,6 +10,8 @@ File format:
 - One list item per change topic
   Change log ends with a list of GitHub PRs
 
+## v4.3.22
+
 ## v4.3.21
 
 ### Enhancements

From 4635d522737f4947204a8433259ad9cdb7ed6a35 Mon Sep 17 00:00:00 2001
From: zhongwencool <zhongwencool@gmail.com>
Date: Fri, 2 Sep 2022 15:04:39 +0800
Subject: [PATCH 2/8] chore: add reboot_hook/shutdown_hook for enterprise

---
 src/emqx.app.src   |  2 +-
 src/emqx.appup.src | 26 ++++++++++++++++++++------
 src/emqx.erl       | 33 +++++++++++++++++++++++++++++++--
 3 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/src/emqx.app.src b/src/emqx.app.src
index 433c75326..99715d1a2 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.3.22"}, % strict semver, bump manually!
+  {vsn, "4.3.23"}, % strict semver, bump manually!
   {modules, []},
   {registered, []},
   {applications, [ kernel
diff --git a/src/emqx.appup.src b/src/emqx.appup.src
index 600c87d8d..8a0a2d4ff 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.3.21",
+  [{"4.3.22",
+   [{load_module,emqx,brutal_purge,soft_purge,[]},
+    {load_module,emqx_app,brutal_purge,soft_purge,[]}]},
+   {"4.3.21",
     [{load_module,emqx_alarm,brutal_purge,soft_purge,[]},
      {load_module,emqx_app,brutal_purge,soft_purge,[]},
      {load_module,emqx_connection,brutal_purge,soft_purge,[]},
@@ -11,7 +14,8 @@
      {load_module,emqx_cm,brutal_purge,soft_purge,[]},
      {load_module,emqx_ws_connection,brutal_purge,soft_purge,[]},
      {load_module,emqx_tracer,brutal_purge,soft_purge,[]},
-     {load_module,emqx_channel,brutal_purge,soft_purge,[]}]},
+     {load_module,emqx_channel,brutal_purge,soft_purge,[]},
+     {load_module,emqx,brutal_purge,soft_purge,[]}]},
    {"4.3.20",
     [{load_module,emqx_plugins,brutal_purge,soft_purge,[]},
      {load_module,emqx_router_helper,brutal_purge,soft_purge,[]},
@@ -24,7 +28,8 @@
      {load_module,emqx_channel,brutal_purge,soft_purge,[]},
      {load_module,emqx_app,brutal_purge,soft_purge,[]},
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
-     {load_module,emqx_cm,brutal_purge,soft_purge,[]}]},
+     {load_module,emqx_cm,brutal_purge,soft_purge,[]},
+     {load_module,emqx,brutal_purge,soft_purge,[]}]},
    {"4.3.19",
     [{load_module,emqx_listeners,brutal_purge,soft_purge,[]},
      {load_module,emqx_router_helper,brutal_purge,soft_purge,[]},
@@ -37,6 +42,7 @@
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_misc,brutal_purge,soft_purge,[]},
      {load_module,emqx_app,brutal_purge,soft_purge,[]},
+     {load_module,emqx,brutal_purge,soft_purge,[]},
      {load_module,emqx_cm,brutal_purge,soft_purge,[]},
      {load_module,emqx_plugins,brutal_purge,soft_purge,[]},
      {load_module,emqx_channel,brutal_purge,soft_purge,[]}]},
@@ -54,6 +60,7 @@
      {load_module,emqx_cm,brutal_purge,soft_purge,[]},
      {load_module,emqx_channel,brutal_purge,soft_purge,[]},
      {load_module,emqx_app,brutal_purge,soft_purge,[]},
+     {load_module,emqx,brutal_purge,soft_purge,[]},
      {load_module,emqx_plugins,brutal_purge,soft_purge,[]}]},
    {"4.3.17",
     [{load_module,emqx_listeners,brutal_purge,soft_purge,[]},
@@ -819,7 +826,10 @@
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
    {<<".*">>,[]}],
-  [{"4.3.21",
+  [{"4.3.22",
+   [{load_module,emqx,brutal_purge,soft_purge,[]},
+    {load_module,emqx_app,brutal_purge,soft_purge,[]}]},
+   {"4.3.21",
     [{load_module,emqx_alarm,brutal_purge,soft_purge,[]},
      {load_module,emqx_app,brutal_purge,soft_purge,[]},
      {load_module,emqx_connection,brutal_purge,soft_purge,[]},
@@ -829,7 +839,8 @@
      {load_module,emqx_cm,brutal_purge,soft_purge,[]},
      {load_module,emqx_ws_connection,brutal_purge,soft_purge,[]},
      {load_module,emqx_tracer,brutal_purge,soft_purge,[]},
-     {load_module,emqx_channel,brutal_purge,soft_purge,[]}]},
+     {load_module,emqx_channel,brutal_purge,soft_purge,[]},
+     {load_module,emqx,brutal_purge,soft_purge,[]}]},
    {"4.3.20",
     [{load_module,emqx_plugins,brutal_purge,soft_purge,[]},
      {load_module,emqx_router_helper,brutal_purge,soft_purge,[]},
@@ -842,7 +853,8 @@
      {load_module,emqx_channel,brutal_purge,soft_purge,[]},
      {load_module,emqx_app,brutal_purge,soft_purge,[]},
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
-     {load_module,emqx_cm,brutal_purge,soft_purge,[]}]},
+     {load_module,emqx_cm,brutal_purge,soft_purge,[]},
+     {load_module,emqx,brutal_purge,soft_purge,[]}]},
    {"4.3.19",
     [{load_module,emqx_listeners,brutal_purge,soft_purge,[]},
      {load_module,emqx_router_helper,brutal_purge,soft_purge,[]},
@@ -855,6 +867,7 @@
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_misc,brutal_purge,soft_purge,[]},
      {load_module,emqx_app,brutal_purge,soft_purge,[]},
+     {load_module,emqx,brutal_purge,soft_purge,[]},
      {load_module,emqx_cm,brutal_purge,soft_purge,[]},
      {load_module,emqx_plugins,brutal_purge,soft_purge,[]},
      {load_module,emqx_channel,brutal_purge,soft_purge,[]}]},
@@ -872,6 +885,7 @@
      {load_module,emqx_cm,brutal_purge,soft_purge,[]},
      {load_module,emqx_channel,brutal_purge,soft_purge,[]},
      {load_module,emqx_app,brutal_purge,soft_purge,[]},
+     {load_module,emqx,brutal_purge,soft_purge,[]},
      {load_module,emqx_plugins,brutal_purge,soft_purge,[]}]},
    {"4.3.17",
     [{load_module,emqx_listeners,brutal_purge,soft_purge,[]},
diff --git a/src/emqx.erl b/src/emqx.erl
index 469a4672b..4892fa6cc 100644
--- a/src/emqx.erl
+++ b/src/emqx.erl
@@ -228,6 +228,7 @@ shutdown() ->
 
 shutdown(Reason) ->
     ?LOG(critical, "emqx shutdown for ~s", [Reason]),
+    on_shutdown_hook(Reason),
     _ = emqx_plugins:unload(),
     lists:foreach(fun application:stop/1
                  , lists:reverse(default_started_applications())
@@ -238,10 +239,12 @@ reboot() ->
         true ->
             _ = application:stop(emqx_dashboard), %% dashboard must be started after mnesia
             lists:foreach(fun application:start/1 , default_started_applications()),
-            application:start(emqx_dashboard);
+            _ = application:start(emqx_dashboard),
+            on_reboot_hooks();
 
         false ->
-            lists:foreach(fun application:start/1 , default_started_applications())
+            lists:foreach(fun application:start/1 , default_started_applications()),
+            on_reboot_hooks()
     end.
 
 is_application_running(App) ->
@@ -256,6 +259,32 @@ default_started_applications() ->
     [gproc, esockd, ranch, cowboy, ekka, emqx, emqx_modules].
 -endif.
 
+-ifdef(EMQX_ENTERPRISE).
+on_reboot_hooks() ->
+    try
+        _ = emqx_license_api:bootstrap_license(),
+        ok
+    catch
+        Kind:Reason:Stack ->
+            ?LOG(critical, "~p while rebooting: ~p, ~p", [Kind, Reason, Stack]),
+            ok
+    end,
+    ok.
+
+on_shutdown_hook(join) ->
+    emqx_modules:sync_load_modules_file(),
+    ok;
+on_shutdown_hook(_) ->
+    ok.
+
+-else.
+on_reboot_hooks() ->
+    ok.
+
+on_shutdown_hook(_) ->
+    ok.
+-endif.
+
 %%--------------------------------------------------------------------
 %% Internal functions
 %%--------------------------------------------------------------------

From 362c176d24842d096108bed0a8eeda6d14b10aef Mon Sep 17 00:00:00 2001
From: zhongwencool <zhongwencool@gmail.com>
Date: Fri, 9 Sep 2022 09:52:33 +0800
Subject: [PATCH 3/8] chore: update appup.src

---
 src/emqx.appup.src | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/emqx.appup.src b/src/emqx.appup.src
index 8a0a2d4ff..f5fb5b0ba 100644
--- a/src/emqx.appup.src
+++ b/src/emqx.appup.src
@@ -28,8 +28,13 @@
      {load_module,emqx_channel,brutal_purge,soft_purge,[]},
      {load_module,emqx_app,brutal_purge,soft_purge,[]},
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
+<<<<<<< HEAD
      {load_module,emqx_cm,brutal_purge,soft_purge,[]},
      {load_module,emqx,brutal_purge,soft_purge,[]}]},
+=======
+     {load_module,emqx,brutal_purge,soft_purge,[]},
+     {load_module,emqx_cm,brutal_purge,soft_purge,[]}]},
+>>>>>>> 8e5674f14 (chore: update appup.src)
    {"4.3.19",
     [{load_module,emqx_listeners,brutal_purge,soft_purge,[]},
      {load_module,emqx_router_helper,brutal_purge,soft_purge,[]},

From c2f1f1aab85fc2cd24d919df8885af31d09f5b49 Mon Sep 17 00:00:00 2001
From: zhongwencool <zhongwencool@gmail.com>
Date: Wed, 14 Sep 2022 10:22:03 +0800
Subject: [PATCH 4/8] chore: rename on_xxx_hooks to on_xxx

---
 src/emqx.appup.src |  5 -----
 src/emqx.erl       | 16 ++++++++--------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/emqx.appup.src b/src/emqx.appup.src
index f5fb5b0ba..8a0a2d4ff 100644
--- a/src/emqx.appup.src
+++ b/src/emqx.appup.src
@@ -28,13 +28,8 @@
      {load_module,emqx_channel,brutal_purge,soft_purge,[]},
      {load_module,emqx_app,brutal_purge,soft_purge,[]},
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
-<<<<<<< HEAD
      {load_module,emqx_cm,brutal_purge,soft_purge,[]},
      {load_module,emqx,brutal_purge,soft_purge,[]}]},
-=======
-     {load_module,emqx,brutal_purge,soft_purge,[]},
-     {load_module,emqx_cm,brutal_purge,soft_purge,[]}]},
->>>>>>> 8e5674f14 (chore: update appup.src)
    {"4.3.19",
     [{load_module,emqx_listeners,brutal_purge,soft_purge,[]},
      {load_module,emqx_router_helper,brutal_purge,soft_purge,[]},
diff --git a/src/emqx.erl b/src/emqx.erl
index 4892fa6cc..ae78e5795 100644
--- a/src/emqx.erl
+++ b/src/emqx.erl
@@ -228,7 +228,7 @@ shutdown() ->
 
 shutdown(Reason) ->
     ?LOG(critical, "emqx shutdown for ~s", [Reason]),
-    on_shutdown_hook(Reason),
+    on_shutdown(Reason),
     _ = emqx_plugins:unload(),
     lists:foreach(fun application:stop/1
                  , lists:reverse(default_started_applications())
@@ -240,11 +240,11 @@ reboot() ->
             _ = application:stop(emqx_dashboard), %% dashboard must be started after mnesia
             lists:foreach(fun application:start/1 , default_started_applications()),
             _ = application:start(emqx_dashboard),
-            on_reboot_hooks();
+            on_reboot();
 
         false ->
             lists:foreach(fun application:start/1 , default_started_applications()),
-            on_reboot_hooks()
+            on_reboot()
     end.
 
 is_application_running(App) ->
@@ -260,7 +260,7 @@ default_started_applications() ->
 -endif.
 
 -ifdef(EMQX_ENTERPRISE).
-on_reboot_hooks() ->
+on_reboot() ->
     try
         _ = emqx_license_api:bootstrap_license(),
         ok
@@ -271,17 +271,17 @@ on_reboot_hooks() ->
     end,
     ok.
 
-on_shutdown_hook(join) ->
+on_shutdown(join) ->
     emqx_modules:sync_load_modules_file(),
     ok;
-on_shutdown_hook(_) ->
+on_shutdown(_) ->
     ok.
 
 -else.
-on_reboot_hooks() ->
+on_reboot() ->
     ok.
 
-on_shutdown_hook(_) ->
+on_shutdown(_) ->
     ok.
 -endif.
 

From 61d745a230218ee59c1083085d6f48f54dda1067 Mon Sep 17 00:00:00 2001
From: zhongwencool <zhongwencool@gmail.com>
Date: Thu, 22 Sep 2022 11:00:16 +0800
Subject: [PATCH 5/8] feat: add emqx_misc:ipv6_probe/2 function

---
 src/emqx.appup.src |  6 ++++++
 src/emqx_misc.erl  | 10 +++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/emqx.appup.src b/src/emqx.appup.src
index 8a0a2d4ff..c7643fdfc 100644
--- a/src/emqx.appup.src
+++ b/src/emqx.appup.src
@@ -3,6 +3,7 @@
 {VSN,
   [{"4.3.22",
    [{load_module,emqx,brutal_purge,soft_purge,[]},
+    {load_module,emqx_misc,brutal_purge,soft_purge,[]},
     {load_module,emqx_app,brutal_purge,soft_purge,[]}]},
    {"4.3.21",
     [{load_module,emqx_alarm,brutal_purge,soft_purge,[]},
@@ -15,6 +16,7 @@
      {load_module,emqx_ws_connection,brutal_purge,soft_purge,[]},
      {load_module,emqx_tracer,brutal_purge,soft_purge,[]},
      {load_module,emqx_channel,brutal_purge,soft_purge,[]},
+     {load_module,emqx_misc,brutal_purge,soft_purge,[]},
      {load_module,emqx,brutal_purge,soft_purge,[]}]},
    {"4.3.20",
     [{load_module,emqx_plugins,brutal_purge,soft_purge,[]},
@@ -29,6 +31,7 @@
      {load_module,emqx_app,brutal_purge,soft_purge,[]},
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_cm,brutal_purge,soft_purge,[]},
+     {load_module,emqx_misc,brutal_purge,soft_purge,[]},
      {load_module,emqx,brutal_purge,soft_purge,[]}]},
    {"4.3.19",
     [{load_module,emqx_listeners,brutal_purge,soft_purge,[]},
@@ -828,6 +831,7 @@
    {<<".*">>,[]}],
   [{"4.3.22",
    [{load_module,emqx,brutal_purge,soft_purge,[]},
+    {load_module,emqx_misc,brutal_purge,soft_purge,[]},
     {load_module,emqx_app,brutal_purge,soft_purge,[]}]},
    {"4.3.21",
     [{load_module,emqx_alarm,brutal_purge,soft_purge,[]},
@@ -840,6 +844,7 @@
      {load_module,emqx_ws_connection,brutal_purge,soft_purge,[]},
      {load_module,emqx_tracer,brutal_purge,soft_purge,[]},
      {load_module,emqx_channel,brutal_purge,soft_purge,[]},
+     {load_module,emqx_misc,brutal_purge,soft_purge,[]},
      {load_module,emqx,brutal_purge,soft_purge,[]}]},
    {"4.3.20",
     [{load_module,emqx_plugins,brutal_purge,soft_purge,[]},
@@ -854,6 +859,7 @@
      {load_module,emqx_app,brutal_purge,soft_purge,[]},
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_cm,brutal_purge,soft_purge,[]},
+     {load_module,emqx_misc,brutal_purge,soft_purge,[]},
      {load_module,emqx,brutal_purge,soft_purge,[]}]},
    {"4.3.19",
     [{load_module,emqx_listeners,brutal_purge,soft_purge,[]},
diff --git a/src/emqx_misc.erl b/src/emqx_misc.erl
index 813ab84e8..bfda5bb38 100644
--- a/src/emqx_misc.erl
+++ b/src/emqx_misc.erl
@@ -45,6 +45,7 @@
         , index_of/2
         , maybe_parse_ip/1
         , ipv6_probe/1
+        , ipv6_probe/2
         ]).
 
 -export([ bin2hexstr_A_F/1
@@ -84,12 +85,15 @@ maybe_parse_ip(Host) ->
 
 %% @doc Add `ipv6_probe' socket option if it's supported.
 ipv6_probe(Opts) ->
+    ipv6_probe(Opts, true).
+
+ipv6_probe(Opts, Ipv6Probe) when is_boolean(Ipv6Probe) orelse is_integer(Ipv6Probe) ->
     Bool = try gen_tcp:ipv6_probe()
            catch _ : _ -> false end,
-    ipv6_probe(Bool, Opts).
+    ipv6_probe(Bool, Opts, Ipv6Probe).
 
-ipv6_probe(false, Opts) -> Opts;
-ipv6_probe(true, Opts) -> [{ipv6_probe, true} | Opts].
+ipv6_probe(false, Opts, _) -> Opts;
+ipv6_probe(true, Opts, Ipv6Probe) -> [{ipv6_probe, Ipv6Probe} | Opts].
 
 %% @doc Merge options
 -spec(merge_opts(Opts, Opts) -> Opts when Opts :: proplists:proplist()).

From 27983e7df40b1deaaecaf4485eb23ae9c8ec3fb9 Mon Sep 17 00:00:00 2001
From: zhongwencool <zhongwencool@gmail.com>
Date: Thu, 22 Sep 2022 14:24:59 +0800
Subject: [PATCH 6/8] chore: update emqx.appup.src

---
 src/emqx.appup.src | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/emqx.appup.src b/src/emqx.appup.src
index c7643fdfc..16dfd1464 100644
--- a/src/emqx.appup.src
+++ b/src/emqx.appup.src
@@ -2,7 +2,16 @@
 %% Unless you know what you are doing, DO NOT edit manually!!
 {VSN,
   [{"4.3.22",
-   [{load_module,emqx,brutal_purge,soft_purge,[]},
+   [{load_module,emqx_plugins,brutal_purge,soft_purge,[]},
+    {load_module,emqx_ws_connection,brutal_purge,soft_purge,[]},
+    {load_module,emqx_tracer,brutal_purge,soft_purge,[]},
+    {load_module,emqx_channel,brutal_purge,soft_purge,[]},
+    {load_module,emqx_alarm,brutal_purge,soft_purge,[]},
+    {load_module,emqx_cm,brutal_purge,soft_purge,[]},
+    {load_module,emqx_router_helper,brutal_purge,soft_purge,[]},
+    {load_module,emqx_router,brutal_purge,soft_purge,[]},
+    {load_module,emqx_connection,brutal_purge,soft_purge,[]},
+    {load_module,emqx,brutal_purge,soft_purge,[]},
     {load_module,emqx_misc,brutal_purge,soft_purge,[]},
     {load_module,emqx_app,brutal_purge,soft_purge,[]}]},
    {"4.3.21",
@@ -830,7 +839,16 @@
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
    {<<".*">>,[]}],
   [{"4.3.22",
-   [{load_module,emqx,brutal_purge,soft_purge,[]},
+   [{load_module,emqx_plugins,brutal_purge,soft_purge,[]},
+    {load_module,emqx_ws_connection,brutal_purge,soft_purge,[]},
+    {load_module,emqx_tracer,brutal_purge,soft_purge,[]},
+    {load_module,emqx_channel,brutal_purge,soft_purge,[]},
+    {load_module,emqx_alarm,brutal_purge,soft_purge,[]},
+    {load_module,emqx_cm,brutal_purge,soft_purge,[]},
+    {load_module,emqx_router_helper,brutal_purge,soft_purge,[]},
+    {load_module,emqx_router,brutal_purge,soft_purge,[]},
+    {load_module,emqx_connection,brutal_purge,soft_purge,[]},
+    {load_module,emqx,brutal_purge,soft_purge,[]},
     {load_module,emqx_misc,brutal_purge,soft_purge,[]},
     {load_module,emqx_app,brutal_purge,soft_purge,[]}]},
    {"4.3.21",

From 9642f25ea0ec99dbe9afd27514785c605bcf398b Mon Sep 17 00:00:00 2001
From: zhongwencool <zhongwencool@gmail.com>
Date: Thu, 22 Sep 2022 14:36:30 +0800
Subject: [PATCH 7/8] chore: update changelog

---
 CHANGES-4.3.md     |  6 ++++--
 src/emqx.app.src   |  2 +-
 src/emqx.appup.src | 29 ++---------------------------
 3 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/CHANGES-4.3.md b/CHANGES-4.3.md
index 2e2f5157c..737303c27 100644
--- a/CHANGES-4.3.md
+++ b/CHANGES-4.3.md
@@ -12,6 +12,10 @@ File format:
 
 ## v4.3.22
 
+### Minor changes
+- Fix delayed publish inaccurate caused by os time change. [#8908](https://github.com/emqx/emqx/pull/8908)
+
+
 ## v4.3.21
 
 ### Enhancements
@@ -25,8 +29,6 @@ File format:
 - TLS listener default buffer size to 4KB [#9007](https://github.com/emqx/emqx/pull/9007)
   Eliminate uncertainty that the buffer size is set by OS default.
 
-- Fix delayed publish inaccurate caused by os time change. [#8908](https://github.com/emqx/emqx/pull/8908)
-
 - Disable authorization for `api/v4/emqx_prometheus` endpoint. [8955](https://github.com/emqx/emqx/pull/8955)
 
 - Added a test to prevent a last will testament message to be
diff --git a/src/emqx.app.src b/src/emqx.app.src
index 99715d1a2..433c75326 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.3.23"}, % strict semver, bump manually!
+  {vsn, "4.3.22"}, % strict semver, bump manually!
   {modules, []},
   {registered, []},
   {applications, [ kernel
diff --git a/src/emqx.appup.src b/src/emqx.appup.src
index 16dfd1464..4bca299a1 100644
--- a/src/emqx.appup.src
+++ b/src/emqx.appup.src
@@ -1,20 +1,7 @@
 %% -*- mode: erlang -*-
 %% Unless you know what you are doing, DO NOT edit manually!!
 {VSN,
-  [{"4.3.22",
-   [{load_module,emqx_plugins,brutal_purge,soft_purge,[]},
-    {load_module,emqx_ws_connection,brutal_purge,soft_purge,[]},
-    {load_module,emqx_tracer,brutal_purge,soft_purge,[]},
-    {load_module,emqx_channel,brutal_purge,soft_purge,[]},
-    {load_module,emqx_alarm,brutal_purge,soft_purge,[]},
-    {load_module,emqx_cm,brutal_purge,soft_purge,[]},
-    {load_module,emqx_router_helper,brutal_purge,soft_purge,[]},
-    {load_module,emqx_router,brutal_purge,soft_purge,[]},
-    {load_module,emqx_connection,brutal_purge,soft_purge,[]},
-    {load_module,emqx,brutal_purge,soft_purge,[]},
-    {load_module,emqx_misc,brutal_purge,soft_purge,[]},
-    {load_module,emqx_app,brutal_purge,soft_purge,[]}]},
-   {"4.3.21",
+  [{"4.3.21",
     [{load_module,emqx_alarm,brutal_purge,soft_purge,[]},
      {load_module,emqx_app,brutal_purge,soft_purge,[]},
      {load_module,emqx_connection,brutal_purge,soft_purge,[]},
@@ -838,19 +825,7 @@
      {load_module,emqx_message,brutal_purge,soft_purge,[]},
      {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
    {<<".*">>,[]}],
-  [{"4.3.22",
-   [{load_module,emqx_plugins,brutal_purge,soft_purge,[]},
-    {load_module,emqx_ws_connection,brutal_purge,soft_purge,[]},
-    {load_module,emqx_tracer,brutal_purge,soft_purge,[]},
-    {load_module,emqx_channel,brutal_purge,soft_purge,[]},
-    {load_module,emqx_alarm,brutal_purge,soft_purge,[]},
-    {load_module,emqx_cm,brutal_purge,soft_purge,[]},
-    {load_module,emqx_router_helper,brutal_purge,soft_purge,[]},
-    {load_module,emqx_router,brutal_purge,soft_purge,[]},
-    {load_module,emqx_connection,brutal_purge,soft_purge,[]},
-    {load_module,emqx,brutal_purge,soft_purge,[]},
-    {load_module,emqx_misc,brutal_purge,soft_purge,[]},
-    {load_module,emqx_app,brutal_purge,soft_purge,[]}]},
+  [
    {"4.3.21",
     [{load_module,emqx_alarm,brutal_purge,soft_purge,[]},
      {load_module,emqx_app,brutal_purge,soft_purge,[]},

From deca9cc39505efb4276696b1ff2392b1cd3f5414 Mon Sep 17 00:00:00 2001
From: zhongwencool <zhongwencool@gmail.com>
Date: Thu, 22 Sep 2022 16:09:42 +0800
Subject: [PATCH 8/8] chore: update changelog for delayed publish

---
 CHANGES-4.3.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES-4.3.md b/CHANGES-4.3.md
index 737303c27..eb5587d78 100644
--- a/CHANGES-4.3.md
+++ b/CHANGES-4.3.md
@@ -13,8 +13,6 @@ File format:
 ## v4.3.22
 
 ### Minor changes
-- Fix delayed publish inaccurate caused by os time change. [#8908](https://github.com/emqx/emqx/pull/8908)
-
 
 ## v4.3.21
 
@@ -34,6 +32,10 @@ File format:
 - Added a test to prevent a last will testament message to be
   published when a client is denied connection. [#8894](https://github.com/emqx/emqx/pull/8894)
 
+### Bug fixes
+
+- Fix delayed publish inaccurate caused by os time change. [#8908](https://github.com/emqx/emqx/pull/8908)
+
 ## v4.3.20
 
 ### Bug fixes