diff options
| author | Michael Adam <obnox@samba.org> | 2011-12-13 14:32:12 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2011-12-23 17:39:02 +0100 |
| commit | 9cae401943fc06f9dd2b2eb5771f38e0eeed1140 (patch) | |
| tree | 5ba1fc5b4a9699278af8b6cb58a144309766bd1d /ctdb/server/ctdb_vacuum.c | |
| parent | 19bbee2acd6c576ebd91940df459f157a4080970 (diff) | |
| download | samba-9cae401943fc06f9dd2b2eb5771f38e0eeed1140.tar.gz samba-9cae401943fc06f9dd2b2eb5771f38e0eeed1140.tar.xz samba-9cae401943fc06f9dd2b2eb5771f38e0eeed1140.zip | |
vacuum: use get_vacuum_interval() in ctdb_vacuum_event()
(instead of using the tunable directly)
(This used to be ctdb commit e40fa9efd1c77aa35c917aba6e6e4d21d9c5cdea)
Diffstat (limited to 'ctdb/server/ctdb_vacuum.c')
| -rw-r--r-- | ctdb/server/ctdb_vacuum.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/ctdb/server/ctdb_vacuum.c b/ctdb/server/ctdb_vacuum.c index 7d6f81bffa0..a338a6dadc9 100644 --- a/ctdb/server/ctdb_vacuum.c +++ b/ctdb/server/ctdb_vacuum.c @@ -1021,7 +1021,9 @@ ctdb_vacuum_event(struct event_context *ev, struct timed_event *te, : ctdb->freeze_mode[ctdb_db->priority] == CTDB_FREEZE_PENDING ? "freeze pending" : "frozen")); - event_add_timed(ctdb->ev, vacuum_handle, timeval_current_ofs(ctdb->tunable.vacuum_default_interval, 0), ctdb_vacuum_event, vacuum_handle); + event_add_timed(ctdb->ev, vacuum_handle, + timeval_current_ofs(get_vacuum_interval(ctdb_db), 0), + ctdb_vacuum_event, vacuum_handle); return; } @@ -1036,7 +1038,9 @@ ctdb_vacuum_event(struct event_context *ev, struct timed_event *te, if (ret != 0) { talloc_free(child_ctx); DEBUG(DEBUG_ERR, ("Failed to create pipe for vacuum child process.\n")); - event_add_timed(ctdb->ev, vacuum_handle, timeval_current_ofs(ctdb->tunable.vacuum_default_interval, 0), ctdb_vacuum_event, vacuum_handle); + event_add_timed(ctdb->ev, vacuum_handle, + timeval_current_ofs(get_vacuum_interval(ctdb_db), 0), + ctdb_vacuum_event, vacuum_handle); return; } @@ -1050,7 +1054,9 @@ ctdb_vacuum_event(struct event_context *ev, struct timed_event *te, close(child_ctx->fd[1]); talloc_free(child_ctx); DEBUG(DEBUG_ERR, ("Failed to fork vacuum child process.\n")); - event_add_timed(ctdb->ev, vacuum_handle, timeval_current_ofs(ctdb->tunable.vacuum_default_interval, 0), ctdb_vacuum_event, vacuum_handle); + event_add_timed(ctdb->ev, vacuum_handle, + timeval_current_ofs(get_vacuum_interval(ctdb_db), 0), + ctdb_vacuum_event, vacuum_handle); return; } |