Merge pull request #4676 from vbotbuildovich/backport-4544-v22.1.x-731

[v22.1.x] cluster: fix disabling leader balancer at runtime
redpanda-data · May 11, 2022 · d1a4e00 · d1a4e00
2 parents 8c07996 + 19a6383
commit d1a4e00
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/v/cluster/scheduling/leader_balancer.cc b/src/v/cluster/scheduling/leader_balancer.cc
@@ -156,6 +156,7 @@ void leader_balancer::trigger_balance() {
         vlog(
           clusterlog.info, "Cannot start rebalance until previous fiber exits");
         _timer.arm(_idle_timeout());
+        return;
     }
 
     if (!_enabled()) {
@@ -187,6 +188,10 @@ void leader_balancer::trigger_balance() {
 }
 
 ss::future<ss::stop_iteration> leader_balancer::balance() {
+    if (!_enabled()) {
+        co_return ss::stop_iteration::yes;
+    }
+
     /*
      * GC the muted and last leader indices
      */