yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9926 from terry-xiaoyu/http-api-cluter-query-in-fixed-order 

fix(http-api): using a fixed order when cluster query nodes
This commit is contained in:
Xinyu Liu 2023-02-07 17:39:54 +08:00 committed by GitHub
parent 90d6e16707 b9a80903e3
commit de19d6f4e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_management/src/emqx_mgmt_api.erl
View File

@ -167,7 +167,7 @@ cluster_query(Params, {Tab, QsSchema}, QueryFun) ->
Start = if Page > 1 -> (Page-1) * Limit; Start = if Page > 1 -> (Page-1) * Limit;
true -> 0 true -> 0
end, end,
Nodes = ekka_mnesia:running_nodes(), Nodes = lists:sort(ekka_mnesia:running_nodes()),
Rows = do_cluster_query(Nodes, Qs, QueryFun, Start, Limit+1, []), Rows = do_cluster_query(Nodes, Qs, QueryFun, Start, Limit+1, []),
Meta = #{page => Page, limit => Limit}, Meta = #{page => Page, limit => Limit},
NMeta = case CodCnt =:= 0 of NMeta = case CodCnt =:= 0 of

2
changes/v4.4.15-en.md
View File

@ -14,6 +14,8 @@
## Bug fixes ## Bug fixes
- The returned client lists of HTTP query `GET /api/v4/clients?_page=2&_limit=20` to different nodes might be inconsistent [#9926](https://github.com/emqx/emqx/pull/9926).
- Fix the problem that new MQTT TLS connections failed to establish after release hot upgrade [#9810](https://github.com/emqx/emqx/pull/9810). - Fix the problem that new MQTT TLS connections failed to establish after release hot upgrade [#9810](https://github.com/emqx/emqx/pull/9810).
For more detailed information please see: [emqx/esockd#170](https://github.com/emqx/esockd/pull/170). For more detailed information please see: [emqx/esockd#170](https://github.com/emqx/esockd/pull/170).

2
changes/v4.4.15-zh.md
View File

@ -14,6 +14,8 @@
## 修复 ## 修复
- 使用 HTTP API `GET /api/v4/clients?_page=2&_limit=20` 请求客户端列表时，请求发送到不同的 emqx 节点，返回的客户端列表可能不一致 [#9926](https://github.com/emqx/emqx/pull/9926)。
- 修复版本热升级之后，新的 MQTT TLS 连接建立失败的问题 [#9810](https://github.com/emqx/emqx/pull/9810)。 - 修复版本热升级之后，新的 MQTT TLS 连接建立失败的问题 [#9810](https://github.com/emqx/emqx/pull/9810)。
详情见：[emqx/esockd#170](https://github.com/emqx/esockd/pull/170) 详情见：[emqx/esockd#170](https://github.com/emqx/esockd/pull/170)