From 1521c6a927e7fc0ff27fdaf19b4a9f355c2dade8 Mon Sep 17 00:00:00 2001
From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 12 Mar 2018 13:24:36 +0000
Subject: [PATCH] [Minor] Try better to expiry bayes in a clustered setup

---
 src/plugins/lua/bayes_expiry.lua | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/plugins/lua/bayes_expiry.lua b/src/plugins/lua/bayes_expiry.lua
index 0088298e2..de848611a 100644
--- a/src/plugins/lua/bayes_expiry.lua
+++ b/src/plugins/lua/bayes_expiry.lua
@@ -32,6 +32,7 @@ local settings = {
   common_ttl_divisor = 10, -- how should we discriminate common elements
   significant_factor = 3.0 / 4.0, -- which tokens should we update
   classifiers = {},
+  cluster_nodes = 0,
 }
 
 local template = {
@@ -130,7 +131,16 @@ if opts then
   end
 end
 
--- Fill template
+-- In clustered setup, we need to increase interval of expiration
+-- according to number of nodes in a cluster
+if settings.cluster_nodes == 0 then
+  local neighbours = obj.neighbours or {}
+  local n_neighbours = 0
+  for _,_ in pairs(neighbours) do n_neighbours = n_neighbours + 1 end
+  settings.cluster_nodes = n_neighbours
+end
+
+  -- Fill template
 template.count = settings.count
 template.threshold = settings.threshold
 template.common_ttl_divisor = settings.common_ttl_divisor
@@ -260,9 +270,11 @@ rspamd_config:add_on_load(function (_, ev_base, worker)
 
   -- Expire tokens at regular intervals
   for _,cls in ipairs(settings.classifiers) do
-    rspamd_config:add_periodic(ev_base, settings['interval'], function ()
-      expire_step(cls, ev_base, worker)
-      return true
-    end, true)
+    rspamd_config:add_periodic(ev_base,
+        settings['interval'] * (tonumber(settings.cluster_nodes) + 1),
+        function ()
+          expire_step(cls, ev_base, worker)
+          return true
+        end, true)
   end
 end)
-- 
2.39.5