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

Merge pull request #11228 from savonarola/0705-rebalance-fixes 

Fix rebalance tests & version
This commit is contained in:
Ilya Averyanov 2023-07-07 19:14:12 +03:00 committed by GitHub
parent f3d6d5c1cc aba52c6a25
commit d2bea433f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_node_rebalance/src/emqx_node_rebalance.app.src
View File

@ -1,6 +1,6 @@
{application, emqx_node_rebalance, [ {application, emqx_node_rebalance, [
{description, "EMQX Node Rebalance"}, {description, "EMQX Node Rebalance"},
{vsn, "5.0.3"}, {vsn, "5.0.4"},
{registered, [ {registered, [
emqx_node_rebalance_sup, emqx_node_rebalance_sup,
emqx_node_rebalance, emqx_node_rebalance,

4
apps/emqx_node_rebalance/test/emqx_node_rebalance_api_SUITE.erl
View File

@ -192,7 +192,7 @@ t_start_stop_evacuation(Config) ->
[{DonorNode, _}, {RecipientNode, _}] = ?config(cluster_nodes, Config), [{DonorNode, _}, {RecipientNode, _}] = ?config(cluster_nodes, Config),
StartOpts = maps:merge( StartOpts = maps:merge(
emqx_node_rebalance_api:rebalance_evacuation_example(), maps:get(evacuation, emqx_node_rebalance_api:rebalance_evacuation_example()),
#{migrate_to => [atom_to_binary(RecipientNode)]} #{migrate_to => [atom_to_binary(RecipientNode)]}
), ),
@ -295,7 +295,7 @@ t_start_stop_rebalance(Config) ->
StartOpts = maps:without( StartOpts = maps:without(
[nodes], [nodes],
emqx_node_rebalance_api:rebalance_example() maps:get(rebalance, emqx_node_rebalance_api:rebalance_example())
), ),
?assertMatch( ?assertMatch(

2
changes/ee/fix-11198.en.md Normal file
View File

@ -0,0 +1,2 @@
Fix global rebalance status evaluation on replicant nodes.
Previously, `/api/v5/load_rebalance/global_status` API method could return incomplete results if handled by a replicant node.