feat(split): ignore splitting partition during load balance (#763)

XiaoMi · Mar 2, 2021 · c53d84e · c53d84e
1 parent ded2abd
commit c53d84e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/meta/greedy_load_balancer.cpp b/src/meta/greedy_load_balancer.cpp
@@ -833,7 +833,7 @@ void greedy_load_balancer::greedy_balancer(const bool balance_checker)
             ddebug_f("skip to do primary balance for the ignored app[{}]", app->get_logname());
             continue;
         }
-        if (app->status != app_status::AS_AVAILABLE || app->is_bulk_loading)
+        if (app->status != app_status::AS_AVAILABLE || app->is_bulk_loading || app->splitting())
             continue;
 
         bool enough_information = primary_balancer_per_app(app);
@@ -880,7 +880,7 @@ void greedy_load_balancer::greedy_balancer(const bool balance_checker)
             continue;
         }
 
-        if (app->status != app_status::AS_AVAILABLE || app->is_bulk_loading)
+        if (app->status != app_status::AS_AVAILABLE || app->is_bulk_loading || app->splitting())
             continue;
 
         bool enough_information = copy_secondary_per_app(app);

diff --git a/src/meta/server_load_balancer.cpp b/src/meta/server_load_balancer.cpp
@@ -978,6 +978,9 @@ bool simple_load_balancer::collect_replica(meta_view view,
                                            const replica_info &info)
 {
     partition_configuration &pc = *get_config(*view.apps, info.pid);
+    // current partition is during partition split
+    if (pc.ballot == invalid_ballot)
+        return false;
     config_context &cc = *get_config_context(*view.apps, info.pid);
     if (is_member(pc, node)) {
         cc.collect_serving_replica(node, info);

diff --git a/src/meta/server_state.cpp b/src/meta/server_state.cpp
@@ -2364,8 +2364,8 @@ bool server_state::check_all_partitions()
         for (unsigned int i = 0; i != app->partition_count; ++i) {
             partition_configuration &pc = app->partitions[i];
             config_context &cc = app->helpers->contexts[i];
-
-            if (cc.stage != config_status::pending_remote_sync) {
+            // partition is under re-configuration or is child partition
+            if (cc.stage != config_status::pending_remote_sync && pc.ballot != invalid_ballot) {
                 configuration_proposal_action action;
                 pc_status s =
                     _meta_svc->get_balancer()->cure({&_all_apps, &_nodes}, pc.pid, action);