Merge branch 'main-v4.3' into mqtt-sn-resume-subs

CHANGES-4.3.md

@@ -28,6 +28,7 @@ File format:
   When set to true, invalid UTF-8 strings will cause the client to be disconnected. i.e. client ID, topic name. [#7261]
 * Changed systemd service restart delay from 10 seconds to 60 seconds.
 * MQTT-SN gateway supports initiative to synchronize registered topics after session resumed. [#7300]
+* Add load control app for future development.
 
 ### Bug fixes
 

rebar.config

@@ -56,6 +56,7 @@
     , {observer_cli, "1.6.1"} % NOTE: depends on recon 2.5.1
     , {getopt, "1.0.1"}
     , {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "0.15.0"}}}
+    , {lc, {git, "https://github.com/emqx/lc.git", {tag, "0.2.0"}}}
     ]}.
 
 {xref_ignores,

src/emqx.app.src

@@ -9,7 +9,15 @@
   {vsn, "4.3.14"}, % strict semver, bump manually!
   {modules, []},
   {registered, []},
-  {applications, [kernel,stdlib,gproc,gen_rpc,esockd,cowboy,sasl,os_mon]},
+  {applications, [ kernel
+                 , stdlib
+                 , gproc
+                 , gen_rpc
+                 , esockd
+                 , cowboy
+                 , sasl
+                 , lc
+                 , os_mon]},
   {mod, {emqx_app,[]}},
   {env, []},
   {licenses, ["Apache-2.0"]},

src/emqx_os_mon.erl

@@ -48,6 +48,7 @@
         ]).
 
 -include("emqx.hrl").
+-include_lib("lc/include/lc.hrl").
 
 -define(OS_MON, ?MODULE).
 
@@ -88,7 +89,15 @@ get_sysmem_high_watermark() ->
     memsup:get_sysmem_high_watermark().
 
 set_sysmem_high_watermark(Float) ->
-    memsup:set_sysmem_high_watermark(Float / 100).
+    V = Float/100,
+    case load_ctl:get_config() of
+        #{ ?MEM_MON_F0 := true } = OldLC ->
+            ok = load_ctl:put_config(OldLC#{ ?MEM_MON_F0 => true
+                                           , ?MEM_MON_F1 => V});
+        _ ->
+            skip
+    end,
+    memsup:set_sysmem_high_watermark(V).
 
 get_procmem_high_watermark() ->
     memsup:get_procmem_high_watermark().