sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

vacuum: add new tunable VacuumInterval and mark Vacuum{Default,Min,Max}Interval obsolete

Browse Source 
And use VacuumInterval instead of VacuumDefaultInterval in the code.

(This used to be ctdb commit 78530f40338f511a7cd1d33ada450905742bfa8f)
This commit is contained in:
Michael Adam 2011-12-13 14:33:08 +01:00
parent 1ca3abc5ba
commit e04fad0ee4
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ctdb/include/ctdb_private.h
View File

@ -108,6 +108,7 @@ struct ctdb_tunable {
uint32_t reclock_latency_ms; uint32_t reclock_latency_ms;
uint32_t recovery_drop_all_ips; uint32_t recovery_drop_all_ips;
uint32_t verify_recovery_lock; uint32_t verify_recovery_lock;
uint32_t vacuum_interval;
uint32_t vacuum_default_interval; uint32_t vacuum_default_interval;
uint32_t vacuum_max_run_time; uint32_t vacuum_max_run_time;
uint32_t repack_limit; uint32_t repack_limit;

7
ctdb/server/ctdb_tunables.c
View File

@ -57,12 +57,13 @@ static const struct {
{ "RecLockLatencyMs", 1000, offsetof(struct ctdb_tunable, reclock_latency_ms) }, { "RecLockLatencyMs", 1000, offsetof(struct ctdb_tunable, reclock_latency_ms) },
{ "RecoveryDropAllIPs", 120, offsetof(struct ctdb_tunable, recovery_drop_all_ips) }, { "RecoveryDropAllIPs", 120, offsetof(struct ctdb_tunable, recovery_drop_all_ips) },
{ "VerifyRecoveryLock", 1, offsetof(struct ctdb_tunable, verify_recovery_lock) }, { "VerifyRecoveryLock", 1, offsetof(struct ctdb_tunable, verify_recovery_lock) },
{ "VacuumDefaultInterval", 10, offsetof(struct ctdb_tunable, vacuum_default_interval) }, { "VacuumInterval", 10, offsetof(struct ctdb_tunable, vacuum_interval) },
{ "VacuumDefaultInterval", 10, offsetof(struct ctdb_tunable, vacuum_default_interval) }, /* OBSOLETE */
{ "VacuumMaxRunTime", 30, offsetof(struct ctdb_tunable, vacuum_max_run_time) }, { "VacuumMaxRunTime", 30, offsetof(struct ctdb_tunable, vacuum_max_run_time) },
{ "RepackLimit", 10000, offsetof(struct ctdb_tunable, repack_limit) }, { "RepackLimit", 10000, offsetof(struct ctdb_tunable, repack_limit) },
{ "VacuumLimit", 5000, offsetof(struct ctdb_tunable, vacuum_limit) }, { "VacuumLimit", 5000, offsetof(struct ctdb_tunable, vacuum_limit) },
{ "VacuumMinInterval", 10, offsetof(struct ctdb_tunable, vacuum_min_interval) }, { "VacuumMinInterval", 10, offsetof(struct ctdb_tunable, vacuum_min_interval) }, /* OBSOLETE */
{ "VacuumMaxInterval", 10, offsetof(struct ctdb_tunable, vacuum_max_interval) }, { "VacuumMaxInterval", 10, offsetof(struct ctdb_tunable, vacuum_max_interval) }, /* OBSOLETE */
{ "VacuumFastPathCount", 60, offsetof(struct ctdb_tunable, vacuum_fast_path_count) }, { "VacuumFastPathCount", 60, offsetof(struct ctdb_tunable, vacuum_fast_path_count) },
{ "MaxQueueDropMsg", 1000000, offsetof(struct ctdb_tunable, max_queue_depth_drop_msg) }, { "MaxQueueDropMsg", 1000000, offsetof(struct ctdb_tunable, max_queue_depth_drop_msg) },
{ "UseStatusEvents", 0, offsetof(struct ctdb_tunable, use_status_events_for_monitoring) }, { "UseStatusEvents", 0, offsetof(struct ctdb_tunable, use_status_events_for_monitoring) },

2
ctdb/server/ctdb_vacuum.c
View File

@ -920,7 +920,7 @@ static int ctdb_vacuum_and_repack_db(struct ctdb_db_context *ctdb_db,
static int get_vacuum_interval(struct ctdb_db_context *ctdb_db) static int get_vacuum_interval(struct ctdb_db_context *ctdb_db)
{ {
uint interval = ctdb_db->ctdb->tunable.vacuum_default_interval; uint interval = ctdb_db->ctdb->tunable.vacuum_interval;
return interval; return interval;
} }