Add a tunable variable to control how long we defer after a ctdb addip until we force...

[ctdb.git] / server / ctdb_recoverd.c

diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c
index d3678718f5f6dede4fe511c449156af88113e959..d206d3d2d5c6efd44b1b6463a239b6d05afd1a4d 100644 (file)
--- a/server/ctdb_recoverd.c
+++ b/server/ctdb_recoverd.c
@@ -1973,6 +1973,10 @@ static void recd_node_rebalance_handler(struct ctdb_context *ctdb, uint64_t srvi
                return;
        }
 
+       if (ctdb->tunable.deferred_rebalance_on_node_add == 0) {
+               return;
+       }
+
        pnn = *(uint32_t *)&data.dptr[0];
 
        lcp2_forcerebalance(ctdb, pnn);
@@ -1983,7 +1987,7 @@ static void recd_node_rebalance_handler(struct ctdb_context *ctdb, uint64_t srvi
        }
        rec->deferred_rebalance_ctx = talloc_new(rec);
        event_add_timed(ctdb->ev, rec->deferred_rebalance_ctx, 
-                       timeval_current_ofs(60, 0),
+                       timeval_current_ofs(ctdb->tunable.deferred_rebalance_on_node_add, 0),
                        ctdb_rebalance_timeout, rec);
 }