[checkmk-commits] Added per user profile cache for e.g. faster access to users contact groups

Module: check_mk Branch: master Commit: 54b72b2562cc9bdd7622fd42e80147fcbf522f44 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54b72b2562cc9b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 25 14:54:23 2016 +0200 Added per user profile cache for e.g. faster access to users contact groups This cache is written when saving the user database and can be read whenever the user profiles of just one or some users are needed. The cache contains the multisite/check_mk config related attributes, no runtime information like the serial or transids. --- web/htdocs/userdb.py | 35 ++++++++++++++++++++++++----------- web/htdocs/visuals.py | 2 +- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 5b2240e..a8e29f5 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -598,6 +598,8 @@ def save_users(profiles): if 'last_seen' in user: save_custom_attr(user_id, 'last_seen', repr(user['last_seen'])) + save_cached_profile(user_id, user, multisite_keys, non_contact_keys) + # During deletion of users we don't delete files which might contain user settings # and e.g. customized views which are not easy to reproduce. We want to keep the # files which are the result of a lot of work even when e.g. the LDAP sync deletes @@ -636,12 +638,29 @@ def rewrite_users(): users = load_users(lock = True) save_users(users) + +def save_cached_profile(user_id, user, multisite_keys, non_contact_keys): + # Only save contact AND multisite attributes to the profile. Not the + # infos that are stored in the custom attribute files. + cache = {} + for key in user.keys(): + if key in multisite_keys or key not in non_contact_keys: + cache[key] = user[key] + + config.save_user_file("cached_profile", cache, user=user_id) + + +def load_cached_profile(): + return config.load_user_file("cached_profile", None) + + def contactgroups_of_user(user_id): - users = load_users() - if user_id not in users: - return [] - else: - return users[user_id].get("contactgroups", []) + user = load_cached_profile() + if user == None: + # No cached profile present. Load all users to get the users data + user = load_users(lock=False)[user_id] + + return user.get("contactgroups", []) #. @@ -768,12 +787,6 @@ class GroupChoice(DualListChoice): return [ (k, t['alias'] and t['alias'] or k) for (k, t) in this_group.items() ] -# TODO: This is not performing good with a large user base. Hope it works for our needs. -# Maybe we need to change it to livestatus or change our data structures somehow in the future. -def groups_of_user(user_id): - users = load_users(lock=False) - return users[user_id]["contactgroups"] - #. # .-Custom-Attrs.--------------------------------------------------------. # | ____ _ _ _ _ | diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 4a2cd0b..ba740b9 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -217,7 +217,7 @@ def available(what, all_visuals): return True if type(visual["public"]) == tuple and visual["public"][0] == "contact_groups": - user_groups = set(userdb.groups_of_user(user)) + user_groups = set(userdb.contactgroups_of_user(user)) if user_groups.intersection(visual["public"][1]): return True