From 841d6d5036073e830228487c66e462c9a5c53e87 Mon Sep 17 00:00:00 2001 From: William Yang Date: Wed, 23 Feb 2022 09:14:28 +0100 Subject: [PATCH 1/3] fix: system mem false alarm --- src/emqx_os_mon.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/emqx_os_mon.erl b/src/emqx_os_mon.erl index 55c324d57..e7565947c 100644 --- a/src/emqx_os_mon.erl +++ b/src/emqx_os_mon.erl @@ -190,7 +190,7 @@ ensure_system_memory_alarm(HW) -> case erlang:whereis(memsup) of undefined -> ok; _Pid -> - {Allocated, Total, _Worst} = memsup:get_memory_data(), + {Total, Allocated, _Worst} = memsup:get_memory_data(), case Total =/= 0 andalso Allocated/Total * 100 > HW of true -> emqx_alarm:activate(high_system_memory_usage, #{high_watermark => HW}); false -> ok From 372ea29d96b40413b5c89e41625cb8b7921821d7 Mon Sep 17 00:00:00 2001 From: William Yang Date: Wed, 23 Feb 2022 09:26:17 +0100 Subject: [PATCH 2/3] fix: upgrade code, system mem false alarm --- src/emqx.appup.src | 1 + 1 file changed, 1 insertion(+) diff --git a/src/emqx.appup.src b/src/emqx.appup.src index 5300e6bc8..610b40c75 100644 --- a/src/emqx.appup.src +++ b/src/emqx.appup.src @@ -5,6 +5,7 @@ {load_module,emqx_banned,brutal_purge,soft_purge,[]}, {load_module,emqx_ctl,brutal_purge,soft_purge,[]}, {load_module,emqx_pmon,brutal_purge,soft_purge,[]}, + {load_module,emqx_os_mon,brutal_purge,soft_purge,[]}, {load_module,emqx_channel,brutal_purge,soft_purge,[]}]}, {"4.3.12", [{load_module,emqx_connection,brutal_purge,soft_purge,[]}, From 2c4fc6f6f7d7fa8917182dc09c52bfc439fafdf5 Mon Sep 17 00:00:00 2001 From: William Yang Date: Wed, 23 Feb 2022 09:28:48 +0100 Subject: [PATCH 3/3] docs(changelog): system mem false alarm --- CHANGES-4.3.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES-4.3.md b/CHANGES-4.3.md index e38cb1b0f..148627628 100644 --- a/CHANGES-4.3.md +++ b/CHANGES-4.3.md @@ -30,6 +30,7 @@ File format: * Fix the ExProto connection registry is not released after the client process abnormally exits [#6983] * Fix Server-KeepAlive wrongly applied on MQTT v3.0/v3.1 [#7085] * Fix Stomp client can not trigger `$event/client_connection` message [#7096] +* Fix system memory false alarm at boot ## v4.3.12 ### Important changes