[Fix] Rework cached Redis logic to avoid sentinels breaking

Issue: #2796

diff --git a/lualib/lua_redis.lua b/lualib/lua_redis.lua
index a5879e130e0839651a7bdcae6b6ad850ee3164f9..4e30850d534bb242f109ef43201d25d850d248f5 100644 (file)
--- a/lualib/lua_redis.lua
+++ b/lualib/lua_redis.lua
@@ -269,14 +269,83 @@ local function calculate_redis_hash(params)
   return h:base32()
 end
 
+local function process_redis_opts(options, redis_params)
+  local default_timeout = 1.0
+  local default_expand_keys = false
+
+  if not redis_params['timeout'] or redis_params['timeout'] == default_timeout then
+    if options['timeout'] then
+      redis_params['timeout'] = tonumber(options['timeout'])
+    else
+      redis_params['timeout'] = default_timeout
+    end
+  end
+
+  if options['prefix'] and not redis_params['prefix'] then
+    redis_params['prefix'] = options['prefix']
+  end
+
+  if type(options['expand_keys']) == 'boolean' then
+    redis_params['expand_keys'] = options['expand_keys']
+  else
+    redis_params['expand_keys'] = default_expand_keys
+  end
+
+  if not redis_params['db'] then
+    if options['db'] then
+      redis_params['db'] = tostring(options['db'])
+    elseif options['dbname'] then
+      redis_params['db'] = tostring(options['dbname'])
+    elseif options['database'] then
+      redis_params['db'] = tostring(options['database'])
+    end
+  end
+  if options['password'] and not redis_params['password'] then
+    redis_params['password'] = options['password']
+  end
+
+  if not redis_params.sentinel and options.sentinel then
+    redis_params.sentinel = options.sentinel
+  end
+end
+
+local function enrich_defaults(rspamd_config, module, redis_params)
+  local opts = rspamd_config:get_all_opt('redis')
+
+  if opts then
+    if opts[module] then
+      process_redis_opts(opts[module], redis_params)
+    end
+
+    process_redis_opts(opts, redis_params)
+  end
+end
+
+local function maybe_return_cached(redis_params)
+  local h = calculate_redis_hash(redis_params)
+
+  if cached_results[h] then
+    lutil.debugm(N, 'reused redis server: %s', redis_params)
+    return cached_results[h]
+  end
+
+  redis_params.hash = h
+  cached_results[h] = redis_params
+
+  if not redis_params.read_only and redis_params.sentinels then
+    add_redis_sentinels(redis_params)
+  end
+
+  lutil.debugm(N, 'loaded new redis server: %s', redis_params)
+  return redis_params
+end
+
 --[[[
 -- @module lua_redis
 -- This module contains helper functions for working with Redis
 --]]
 local function try_load_redis_servers(options, rspamd_config, result)
   local default_port = 6379
-  local default_timeout = 1.0
-  local default_expand_keys = false
   local upstream_list = require "rspamd_upstream_list"
   local read_only = true
 
@@ -333,36 +402,7 @@ local function try_load_redis_servers(options, rspamd_config, result)
   end
 
   -- Store options
-  if not result['timeout'] or result['timeout'] == default_timeout then
-    if options['timeout'] then
-      result['timeout'] = tonumber(options['timeout'])
-    else
-      result['timeout'] = default_timeout
-    end
-  end
-
-  if options['prefix'] and not result['prefix'] then
-    result['prefix'] = options['prefix']
-  end
-
-  if type(options['expand_keys']) == 'boolean' then
-    result['expand_keys'] = options['expand_keys']
-  else
-    result['expand_keys'] = default_expand_keys
-  end
-
-  if not result['db'] then
-    if options['db'] then
-      result['db'] = tostring(options['db'])
-    elseif options['dbname'] then
-      result['db'] = tostring(options['dbname'])
-    elseif options['database'] then
-      result['db'] = tostring(options['database'])
-    end
-  end
-  if options['password'] and not result['password'] then
-    result['password'] = options['password']
-  end
+  process_redis_opts(options, result)
 
   if read_only and not upstreams_write then
     result.read_only = true
@@ -377,25 +417,6 @@ local function try_load_redis_servers(options, rspamd_config, result)
       result.write_servers = upstreams_write
     end
 
-    local h = calculate_redis_hash(result)
-
-    if cached_results[h] then
-      for k,v in pairs(cached_results[h]) do
-        result[k] = v
-      end
-      lutil.debugm(N, 'reused redis server: %s', result)
-      return true
-    end
-
-    result.hash = h
-    cached_results[h] = result
-
-    if not result.read_only and options.sentinels then
-      result.sentinels = options.sentinels
-      add_redis_sentinels(result)
-    end
-
-    lutil.debugm(N, 'loaded redis server: %s', result)
     return true
   end
 
@@ -430,14 +451,20 @@ local function rspamd_parse_redis_server(module_name, module_opts, no_fallback)
       ret = try_load_redis_servers(opts.redis, rspamd_config, result)
 
       if ret then
-        return result
+        if not no_fallback then
+          enrich_defaults(rspamd_config, module_name, result)
+        end
+        return maybe_return_cached(result)
       end
     end
 
     ret = try_load_redis_servers(opts, rspamd_config, result)
 
     if ret then
-      return result
+      if not no_fallback then
+        enrich_defaults(rspamd_config, module_name, result)
+      end
+      return maybe_return_cached(result)
     end
   end
 
@@ -458,7 +485,7 @@ local function rspamd_parse_redis_server(module_name, module_opts, no_fallback)
       ret = try_load_redis_servers(opts[module_name], rspamd_config, result)
 
       if ret then
-        return result
+        return maybe_return_cached(result)
       end
     else
       ret = try_load_redis_servers(opts, rspamd_config, result)
@@ -478,13 +505,13 @@ local function rspamd_parse_redis_server(module_name, module_opts, no_fallback)
       if ret then
         logger.infox(rspamd_config, "use default Redis settings for %s",
             module_name)
-        return result
+        return maybe_return_cached(result)
       end
     end
   end
 
   if result.read_servers then
-      return result
+      return maybe_return_cached(result)
   end
 
   return nil