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

This reverts commit e86e0e8547593eb8ea2d5c65892de81eac694783.

diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index b490b4db0cd342908f06016f2aa867fc300439ff..e1237b3f97b09faae29a964e586dc964c8bf8dc5 100644 (file)
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -122,7 +122,6 @@ struct ctdb_tunable {
        uint32_t vacuum_fast_path_count;
        uint32_t lcp2_public_ip_assignment;
        uint32_t allow_client_db_attach;
-       uint32_t deferred_rebalance_on_node_add;
 };
 
 /*

diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c
index d206d3d2d5c6efd44b1b6463a239b6d05afd1a4d..d3678718f5f6dede4fe511c449156af88113e959 100644 (file)
--- a/server/ctdb_recoverd.c
+++ b/server/ctdb_recoverd.c
@@ -1973,10 +1973,6 @@ 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);
@@ -1987,7 +1983,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(ctdb->tunable.deferred_rebalance_on_node_add, 0),
+                       timeval_current_ofs(60, 0),
                        ctdb_rebalance_timeout, rec);
 }
 

diff --git a/server/ctdb_tunables.c b/server/ctdb_tunables.c
index 62a4dd4f8424a80373e24f70425eb38174133f31..092c30fe9b404265a11c8db3d7139f2fbab342a2 100644 (file)
--- a/server/ctdb_tunables.c
+++ b/server/ctdb_tunables.c
@@ -69,8 +69,7 @@ static const struct {
        { "AllowUnhealthyDBRead", 0,  offsetof(struct ctdb_tunable, allow_unhealthy_db_read) },
        { "StatHistoryInterval",  1,  offsetof(struct ctdb_tunable, stat_history_interval) },
        { "DeferredAttachTO",  120,  offsetof(struct ctdb_tunable, deferred_attach_timeout) },
-       { "AllowClientDBAttach", 1, offsetof(struct ctdb_tunable, allow_client_db_attach) },
-       { "DeferredRebalanceOnNodeAdd", 300, offsetof(struct ctdb_tunable, deferred_rebalance_on_node_add) }
+       { "AllowClientDBAttach", 1, offsetof(struct ctdb_tunable, allow_client_db_attach) }
 };
 
 /*