From 060074e04a25603e86f72d642f2ebc6a06dc2325 Mon Sep 17 00:00:00 2001
From: JimMoen <LnJimMoen@outlook.com>
Date: Fri, 11 Aug 2023 11:27:55 +0800
Subject: [PATCH] fix: api total accumulate ignore `undefined` by down nodes
 result

---
 apps/emqx_authn/src/emqx_authn.app.src           | 2 +-
 apps/emqx_machine/src/emqx_machine.app.src       | 2 +-
 apps/emqx_management/src/emqx_management.app.src | 2 +-
 apps/emqx_management/src/emqx_mgmt_api.erl       | 6 +++++-
 apps/emqx_retainer/src/emqx_retainer.app.src     | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/apps/emqx_authn/src/emqx_authn.app.src b/apps/emqx_authn/src/emqx_authn.app.src
index 4ab86ef4a..ae7bea5da 100644
--- a/apps/emqx_authn/src/emqx_authn.app.src
+++ b/apps/emqx_authn/src/emqx_authn.app.src
@@ -1,7 +1,7 @@
 %% -*- mode: erlang -*-
 {application, emqx_authn, [
     {description, "EMQX Authentication"},
-    {vsn, "0.1.24"},
+    {vsn, "0.1.25"},
     {modules, []},
     {registered, [emqx_authn_sup, emqx_authn_registry]},
     {applications, [
diff --git a/apps/emqx_machine/src/emqx_machine.app.src b/apps/emqx_machine/src/emqx_machine.app.src
index e86351556..dd1915cfb 100644
--- a/apps/emqx_machine/src/emqx_machine.app.src
+++ b/apps/emqx_machine/src/emqx_machine.app.src
@@ -3,7 +3,7 @@
     {id, "emqx_machine"},
     {description, "The EMQX Machine"},
     % strict semver, bump manually!
-    {vsn, "0.2.11"},
+    {vsn, "0.2.12"},
     {modules, []},
     {registered, []},
     {applications, [kernel, stdlib, emqx_ctl]},
diff --git a/apps/emqx_management/src/emqx_management.app.src b/apps/emqx_management/src/emqx_management.app.src
index 0e2d37285..e1056ab0c 100644
--- a/apps/emqx_management/src/emqx_management.app.src
+++ b/apps/emqx_management/src/emqx_management.app.src
@@ -2,7 +2,7 @@
 {application, emqx_management, [
     {description, "EMQX Management API and CLI"},
     % strict semver, bump manually!
-    {vsn, "5.0.27"},
+    {vsn, "5.0.28"},
     {modules, []},
     {registered, [emqx_management_sup]},
     {applications, [kernel, stdlib, emqx_plugins, minirest, emqx, emqx_ctl, emqx_bridge_http]},
diff --git a/apps/emqx_management/src/emqx_mgmt_api.erl b/apps/emqx_management/src/emqx_mgmt_api.erl
index dd82cffec..0acffbe4a 100644
--- a/apps/emqx_management/src/emqx_mgmt_api.erl
+++ b/apps/emqx_management/src/emqx_mgmt_api.erl
@@ -460,7 +460,11 @@ finalize_query(Result = #{overflow := Overflow}, QueryState = #{complete := Comp
     maybe_accumulate_totals(Result#{hasnext => HasNext}, QueryState).
 
 maybe_accumulate_totals(Result, #{total := TotalAcc}) ->
-    QueryTotal = maps:fold(fun(_Node, T, N) -> N + T end, 0, TotalAcc),
+    AccFun = fun
+        (_Node, NodeTotal, AccIn) when is_number(NodeTotal) -> AccIn + NodeTotal;
+        (_Node, _, AccIn) -> AccIn
+    end,
+    QueryTotal = maps:fold(AccFun, 0, TotalAcc),
     Result#{total => QueryTotal};
 maybe_accumulate_totals(Result, _QueryState) ->
     Result.
diff --git a/apps/emqx_retainer/src/emqx_retainer.app.src b/apps/emqx_retainer/src/emqx_retainer.app.src
index 5238328f0..8f7c9aa17 100644
--- a/apps/emqx_retainer/src/emqx_retainer.app.src
+++ b/apps/emqx_retainer/src/emqx_retainer.app.src
@@ -2,7 +2,7 @@
 {application, emqx_retainer, [
     {description, "EMQX Retainer"},
     % strict semver, bump manually!
-    {vsn, "5.0.16"},
+    {vsn, "5.0.17"},
     {modules, []},
     {registered, [emqx_retainer_sup]},
     {applications, [kernel, stdlib, emqx, emqx_ctl]},