diff options
| author | Martin Schwenke <martin@meltin.net> | 2020-03-27 14:38:09 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2020-04-07 01:26:41 +0000 |
| commit | 5d03a3c86ebe52832584737deb5e9dff7ccb5916 (patch) | |
| tree | b0a877718b7fd9fe9fe5ba33d0b483d235e022fb /ctdb | |
| parent | 7ad7c0b9324c30b32e972df4cbff229e380d71f1 (diff) | |
| download | samba-5d03a3c86ebe52832584737deb5e9dff7ccb5916.tar.gz | |
ctdb-vacuum: Store value of VacuumInterval in ctdb_vacuum_handle
No behaviour change. This is final staging to make the next change
completely obvious.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/server/ctdb_vacuum.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/ctdb/server/ctdb_vacuum.c b/ctdb/server/ctdb_vacuum.c index b159b7d6a34..a6ffc13c75a 100644 --- a/ctdb/server/ctdb_vacuum.c +++ b/ctdb/server/ctdb_vacuum.c @@ -62,6 +62,7 @@ struct ctdb_vacuum_child_context { struct ctdb_vacuum_handle { struct ctdb_db_context *ctdb_db; uint32_t fast_path_count; + uint32_t vacuum_interval; }; @@ -1331,10 +1332,12 @@ static int vacuum_child_destructor(struct ctdb_vacuum_child_context *child_ctx) ctdb->vacuumer = NULL; if (child_ctx->scheduled) { + vacuum_handle->vacuum_interval = get_vacuum_interval(ctdb_db); + tevent_add_timer( ctdb->ev, vacuum_handle, - timeval_current_ofs(get_vacuum_interval(ctdb_db), 0), + timeval_current_ofs(vacuum_handle->vacuum_interval, 0), ctdb_vacuum_event, vacuum_handle); } @@ -1516,9 +1519,12 @@ static void ctdb_vacuum_event(struct tevent_context *ev, struct ctdb_context *ctdb = ctdb_db->ctdb; struct ctdb_vacuum_child_context *child_ctx = NULL; uint32_t fast_path_max = ctdb->tunable.vacuum_fast_path_count; + uint32_t vacuum_interval = get_vacuum_interval(ctdb_db); bool full_vacuum_run = false; int ret; + vacuum_handle->vacuum_interval = vacuum_interval; + if (vacuum_handle->fast_path_count >= fast_path_max) { if (fast_path_max > 0) { full_vacuum_run = true; @@ -1551,7 +1557,7 @@ static void ctdb_vacuum_event(struct tevent_context *ev, tevent_add_timer(ctdb->ev, vacuum_handle, timeval_current_ofs( - get_vacuum_interval(ctdb_db), 0), + vacuum_handle->vacuum_interval, 0), ctdb_vacuum_event, vacuum_handle); } @@ -1678,12 +1684,13 @@ int ctdb_vacuum_init(struct ctdb_db_context *ctdb_db) vacuum_handle->ctdb_db = ctdb_db; vacuum_handle->fast_path_count = 0; + vacuum_handle->vacuum_interval = get_vacuum_interval(ctdb_db); ctdb_db->vacuum_handle = vacuum_handle; tevent_add_timer(ctdb_db->ctdb->ev, vacuum_handle, - timeval_current_ofs(get_vacuum_interval(ctdb_db), 0), + timeval_current_ofs(vacuum_handle->vacuum_interval, 0), ctdb_vacuum_event, vacuum_handle); |