From 9bb159cf1ec2b164fed8e6a7e26aa3bd25ce69f3 Mon Sep 17 00:00:00 2001 From: Ilya Averyanov Date: Wed, 5 Jul 2023 12:48:09 +0300 Subject: [PATCH 1/2] fix(rebalance): fix changelog and version --- apps/emqx_node_rebalance/src/emqx_node_rebalance.app.src | 2 +- changes/ee/fix-11198.en.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 changes/ee/fix-11198.en.md diff --git a/apps/emqx_node_rebalance/src/emqx_node_rebalance.app.src b/apps/emqx_node_rebalance/src/emqx_node_rebalance.app.src index c175097e5..edfa6574e 100644 --- a/apps/emqx_node_rebalance/src/emqx_node_rebalance.app.src +++ b/apps/emqx_node_rebalance/src/emqx_node_rebalance.app.src @@ -1,6 +1,6 @@ {application, emqx_node_rebalance, [ {description, "EMQX Node Rebalance"}, - {vsn, "5.0.3"}, + {vsn, "5.0.4"}, {registered, [ emqx_node_rebalance_sup, emqx_node_rebalance, diff --git a/changes/ee/fix-11198.en.md b/changes/ee/fix-11198.en.md new file mode 100644 index 000000000..60173dc73 --- /dev/null +++ b/changes/ee/fix-11198.en.md @@ -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. From aba52c6a257ff9c75015fc3be6a67662072f151a Mon Sep 17 00:00:00 2001 From: Ilya Averyanov Date: Fri, 7 Jul 2023 17:57:52 +0300 Subject: [PATCH 2/2] chore(rebalance test): fix API tests --- .../test/emqx_node_rebalance_api_SUITE.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/emqx_node_rebalance/test/emqx_node_rebalance_api_SUITE.erl b/apps/emqx_node_rebalance/test/emqx_node_rebalance_api_SUITE.erl index bb691a754..188e6bf71 100644 --- a/apps/emqx_node_rebalance/test/emqx_node_rebalance_api_SUITE.erl +++ b/apps/emqx_node_rebalance/test/emqx_node_rebalance_api_SUITE.erl @@ -192,7 +192,7 @@ t_start_stop_evacuation(Config) -> [{DonorNode, _}, {RecipientNode, _}] = ?config(cluster_nodes, Config), 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)]} ), @@ -295,7 +295,7 @@ t_start_stop_rebalance(Config) -> StartOpts = maps:without( [nodes], - emqx_node_rebalance_api:rebalance_example() + maps:get(rebalance, emqx_node_rebalance_api:rebalance_example()) ), ?assertMatch(