paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-07 15:33:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do memcached accounting on the memcached repopulating commands.

Browse Source 
(imported from commit 56b30c04e7aee9c9d8493d872b3b367f2be14262)
This commit is contained in:
Tim Abbott
2013-05-13 12:11:53 -04:00
parent 72a7780c57
commit c6f04a2c75
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zephyr/lib/cache.py
View File

@@ -90,13 +90,13 @@ def cache_get_many(keys, cache_name=None):
memcached_stats_finish() memcached_stats_finish()
return ret return ret
def cache_set_many(items, cache_name=None): def cache_set_many(items, cache_name=None, timeout=None):
memcached_stats_start() memcached_stats_start()
if cache_name is None: if cache_name is None:
cache_backend = djcache cache_backend = djcache
else: else:
cache_backend = get_cache(cache_name) cache_backend = get_cache(cache_name)
ret = cache_backend.set_many(items) ret = cache_backend.set_many(items, timeout=timeout)
memcached_stats_finish() memcached_stats_finish()
return ret return ret

13
zephyr/lib/cache_helpers.py
View File

@@ -8,7 +8,8 @@ from zephyr.models import Message, UserProfile, Stream, get_stream_cache_key, \
Recipient, get_recipient_cache_key, Client, get_client_cache_key, \ Recipient, get_recipient_cache_key, Client, get_client_cache_key, \
Huddle, huddle_hash_cache_key Huddle, huddle_hash_cache_key
from zephyr.lib.cache import cache_with_key, djcache, message_cache_key, \ from zephyr.lib.cache import cache_with_key, djcache, message_cache_key, \
user_profile_by_email_cache_key, user_profile_by_id_cache_key user_profile_by_email_cache_key, user_profile_by_id_cache_key, \
get_memcached_time, get_memcached_requests, cache_set_many
from django.utils.importlib import import_module from django.utils.importlib import import_module
from django.contrib.sessions.models import Session from django.contrib.sessions.models import Session
import logging import logging
@@ -70,6 +71,8 @@ cache_fillers = {
} }
def fill_memcached_cache(cache): def fill_memcached_cache(cache):
memcached_time_start = get_memcached_time()
memcached_requests_start = get_memcached_requests()
items_for_memcached = {} items_for_memcached = {}
(objects, items_filler, timeout, batch_size) = cache_fillers[cache] (objects, items_filler, timeout, batch_size) = cache_fillers[cache]
count = 0 count = 0
@@ -77,7 +80,9 @@ def fill_memcached_cache(cache):
items_filler(items_for_memcached, obj) items_filler(items_for_memcached, obj)
count += 1 count += 1
if (count % batch_size == 0): if (count % batch_size == 0):
djcache.set_many(items_for_memcached, timeout=3600*24) cache_set_many(items_for_memcached, timeout=3600*24)
items_for_memcached = {} items_for_memcached = {}
djcache.set_many(items_for_memcached, timeout=3600*24*7) cache_set_many(items_for_memcached, timeout=3600*24*7)
logging.info("Succesfully populated %s cache!" % (cache,)) logging.info("Succesfully populated %s cache! Consumed %s memcached queries (%s time)" % \
(cache, get_memcached_requests() - memcached_requests_start,
round(get_memcached_time() - memcached_time_start, 2)))