summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2010-12-20 17:54:04 +0100
committerMichael Adam <obnox@samba.org>2011-03-14 13:35:48 +0100
commitcab1f75db500df4f778aaac45b2305a476a44d69 (patch)
treee1213252707b6828cd49d2fd64da2fc077287f61
parentf502e5aa983fd0d9dc11f6d4d957aaf0a91b2b8c (diff)
downloadsamba-cab1f75db500df4f778aaac45b2305a476a44d69.tar.gz
samba-cab1f75db500df4f778aaac45b2305a476a44d69.tar.xz
samba-cab1f75db500df4f778aaac45b2305a476a44d69.zip
vacuum: reset the fast path count in the event handle if it exceeds the limit.
(This used to be ctdb commit 91e6d36a190b1c9e4c8b18f7833e51c5c9a67574)
-rw-r--r--ctdb/server/ctdb_vacuum.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ctdb/server/ctdb_vacuum.c b/ctdb/server/ctdb_vacuum.c
index 946aa322a3..b6fff1e340 100644
--- a/ctdb/server/ctdb_vacuum.c
+++ b/ctdb/server/ctdb_vacuum.c
@@ -1029,6 +1029,10 @@ ctdb_vacuum_event(struct event_context *ev, struct timed_event *te,
return;
}
+ if (vacuum_handle->fast_path_count > ctdb->tunable.vacuum_fast_path_count) {
+ vacuum_handle->fast_path_count = 0;
+ }
+
child_ctx->child_pid = ctdb_fork(ctdb);
if (child_ctx->child_pid == (pid_t)-1) {
close(child_ctx->fd[0]);