Merge "Deprecate cache_on_issue configuration option"

This commit is contained in:
Zuul 2019-02-21 14:24:28 +00:00 committed by Gerrit Code Review
commit ace4584194
2 changed files with 14 additions and 3 deletions

View File

@ -104,10 +104,21 @@ other role assignments.
cache_on_issue = cfg.BoolOpt(
'cache_on_issue',
default=True,
deprecated_since=versionutils.deprecated.STEIN,
deprecated_reason=utils.fmt("""
Keystone already exposes a configuration option for caching tokens. Having a
separate configuration option to cache tokens when they are issued is
redundant, unnecessarily complicated, and is misleading if token caching is
disabled because tokens will still be pre-cached by default when they are
issued. The ability to pre-cache tokens when they are issued is going to rely
exclusively on the ``keystone.conf [token] caching`` option in the future.
"""),
deprecated_for_removal=True,
help=utils.fmt("""
Enable storing issued token data to token validation cache so that first token
validation doesn't actually cause full validation cycle. This option has no
effect unless global caching and token caching are enabled.
effect unless global caching is enabled and will still cache tokens even if
`[token] caching = False`.
"""))
allow_expired_window = cfg.IntOpt(

View File

@ -125,7 +125,7 @@ class Manager(manager.Manager):
consuming notifications that signal invalidating the token cache.
"""
if CONF.token.cache_on_issue:
if CONF.token.cache_on_issue or CONF.token.caching:
TOKENS_REGION.invalidate()
def check_revocation_v3(self, token):
@ -252,7 +252,7 @@ class Manager(manager.Manager):
token.mint(token_id, issued_at)
# cache the token object and with ID
if CONF.token.cache_on_issue:
if CONF.token.cache_on_issue or CONF.token.caching:
# NOTE(amakarov): here and above TOKENS_REGION is to be passed
# to serve as required positional "self" argument. It's ignored,
# so I've put it here for convenience - any placeholder is fine.