sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

vacuum: use get_vacuum_interval() in ctdb_vacuum_event()

Browse Source 
(instead of using the tunable directly)

(This used to be ctdb commit e40fa9efd1c77aa35c917aba6e6e4d21d9c5cdea)
This commit is contained in:
Michael Adam 2011-12-13 14:32:12 +01:00
parent 19bbee2acd
commit 9cae401943
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ctdb/server/ctdb_vacuum.c
View File

@ -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;
}