tunables: Remove obsolete tunables

Signed-off-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index e961b9310a1cc45a9c485d7779f75edd6c34f9da..b4966b8807ce070f16dc4f48e2873f6d6b7eefec 100644 (file)
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -102,12 +102,9 @@ struct ctdb_tunable {
        uint32_t recovery_drop_all_ips;
        uint32_t verify_recovery_lock;
        uint32_t vacuum_interval;
-       uint32_t vacuum_default_interval;
        uint32_t vacuum_max_run_time;
        uint32_t repack_limit;
        uint32_t vacuum_limit;
-       uint32_t vacuum_min_interval;
-       uint32_t vacuum_max_interval;
        uint32_t max_queue_depth_drop_msg;
        uint32_t use_status_events_for_monitoring;
        uint32_t allow_unhealthy_db_read;

diff --git a/server/ctdb_tunables.c b/server/ctdb_tunables.c
index 4c139ea2a600aa19b30f08ec73a6ee53447113d7..f760cb57bd6bc21a0df80cd87f315a1b11aac8af 100644 (file)
--- a/server/ctdb_tunables.c
+++ b/server/ctdb_tunables.c
@@ -59,12 +59,9 @@ static const struct {
        { "RecoveryDropAllIPs", 120,  offsetof(struct ctdb_tunable, recovery_drop_all_ips), false },
        { "VerifyRecoveryLock",   1,  offsetof(struct ctdb_tunable, verify_recovery_lock), false },
        { "VacuumInterval",   10,  offsetof(struct ctdb_tunable, vacuum_interval), false },
-       { "VacuumDefaultInterval", 10,  offsetof(struct ctdb_tunable, vacuum_default_interval), true },
        { "VacuumMaxRunTime",     120,  offsetof(struct ctdb_tunable, vacuum_max_run_time), false },
        { "RepackLimit",      10000,  offsetof(struct ctdb_tunable, repack_limit), false },
        { "VacuumLimit",       5000,  offsetof(struct ctdb_tunable, vacuum_limit), false },
-       { "VacuumMinInterval",   10,  offsetof(struct ctdb_tunable, vacuum_min_interval), true },
-       { "VacuumMaxInterval",   10,  offsetof(struct ctdb_tunable, vacuum_max_interval), true },
        { "VacuumFastPathCount", 60, offsetof(struct ctdb_tunable, vacuum_fast_path_count), false },
        { "MaxQueueDropMsg",  1000000, offsetof(struct ctdb_tunable, max_queue_depth_drop_msg), false },
        { "UseStatusEvents",     0,  offsetof(struct ctdb_tunable, use_status_events_for_monitoring), false },