vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-29 07:29:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixes backup/restore possibly causing inconsistent redis keys

Browse source
This commit is contained in:
Simone Mainardi 2020-10-12 17:02:08 +02:00
parent 23aa34904d
commit 22bc7ad57c
2 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
scripts/lua/modules/prefs_dump_utils.lua
View file

@ -15,6 +15,10 @@ local empty_string_dump = "00000600CB7634C0FA2A9E49"
-- ###########################################
local patterns = {"ntopng.prefs.*", "ntopng.user.*"}
-- ###########################################
local function set_admin_prefs()
-- User admin is always an administrator, let's make sure serialized values are correct
ntop.setCache("ntopng.user.admin.group", "administrator")
@ -31,8 +35,6 @@ function prefs_dump_utils.savePrefsToDisk()
set_admin_prefs()
local patterns = {"ntopng.prefs.*", "ntopng.user.*"}
local out = {}
for _, pattern in pairs(patterns) do
-- ntop.getKeysCache returns all the redis keys
@ -83,8 +85,20 @@ function prefs_dump_utils.readPrefsFromDisk()
return
end
local json = require("dkjson")
-- To make sure the restore puts all keys in a consistent state,
-- before doing the actual restore, all the existing keys matching the bakcup/restore patterns
-- are deleted.
-- Failing to do this delete could result in inconsistent redis state as:
-- 1. There could be redis keys not yet backed up to file (backup is done at most once every few seconds)
-- 2. Redis keys not backed up to file could rely/depends on other keys that won't be restored.
for _, pattern in pairs(patterns) do
local keys = ntop.getKeysCache(pattern)
for k, _ in pairs(keys or {}) do
ntop.delCache(k)
end
end
local json = require("dkjson")
local restore = json.decode(dump, 1, nil)
for k,v in pairs(restore or {}) do