openstack/deb-keystone
Code Issues Proposed changes

Merge "Request cache should not update context"

Browse Source
This commit is contained in:
Jenkins 2016-11-10 07:59:51 +00:00 committed by Gerrit Code Review
commit dacd57f972
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
keystone/common/cache/_context_cache.py vendored
View File

@ -39,14 +39,12 @@ class _ResponseCacheProxy(proxy.ProxyBackend):
def _get_request_key(self, key):
return self.__key_pfx % key
def _set_local_cache(self, key, value, ctx=None):
def _set_local_cache(self, key, value):
# Set a serialized version of the returned value in local cache for
# subsequent calls to the memoized method.
if not ctx:
ctx = self._get_request_context()
ctx = self._get_request_context()
serialize = {'payload': value.payload, 'metadata': value.metadata}
setattr(ctx, self._get_request_key(key), msgpackutils.dumps(serialize))
ctx.update_store()
def _get_local_cache(self, key):
# Return the version from our local request cache if it exists.
@ -65,7 +63,6 @@ class _ResponseCacheProxy(proxy.ProxyBackend):
ctx = self._get_request_context()
try:
delattr(ctx, self._get_request_key(key))
ctx.update_store()
except AttributeError: # nosec
# NOTE(morganfainberg): We will simply pass here, this value has
# not been cached locally in the request.
@ -99,9 +96,8 @@ class _ResponseCacheProxy(proxy.ProxyBackend):
return [values[k] for k in keys]
def set_multi(self, mapping):
ctx = self._get_request_context()
for k, v in mapping.items():
self._set_local_cache(k, v, ctx)
self._set_local_cache(k, v)
self.proxied.set_multi(mapping)
def delete_multi(self, keys):