Merge "Fixing flushing tokens workflow" into stable/newton

This commit is contained in:
Jenkins 2017-07-14 22:53:30 +00:00 committed by Gerrit Code Review
commit c1a8abb9f8
2 changed files with 21 additions and 1 deletions

View File

@ -269,7 +269,12 @@ class Token(token.persistence.TokenDriverV8):
return _expiry_range_all
def flush_expired_tokens(self):
with sql.session_for_write() as session:
# The DBAPI itself is in a "never autocommit" mode,
# BEGIN is emitted automatically as soon as any work is done,
# COMMIT is emitted when SQLAlchemy invokes commit() on the
# underlying DBAPI connection. So SQLAlchemy is only simulating
# "begin" here in any case, it is in fact automatic by the DBAPI.
with sql.session_for_write() as session: # Calls session.begin()
dialect = session.bind.dialect.name
expiry_range_func = self._expiry_range_strategy(dialect)
query = session.query(TokenModel.expires)
@ -279,8 +284,17 @@ class Token(token.persistence.TokenDriverV8):
delete_query = query.filter(TokenModel.expires <=
expiry_time)
row_count = delete_query.delete(synchronize_session=False)
# Explicitly commit each batch so as to free up
# resources early. We do not actually need
# transactional semantics here.
session.commit() # Emits connection.commit() on DBAPI
# Tells SQLAlchemy to "begin", e.g. hold a new connection
# open in a transaction
session.begin()
total_removed += row_count
LOG.debug('Removed %d total expired tokens', total_removed)
# When the "with: " block ends, the final "session.commit()"
# is emitted by enginefacade
session.flush()
LOG.info(_LI('Total expired tokens removed: %d'), total_removed)

View File

@ -0,0 +1,6 @@
---
fixes:
- |
[`bug 1689616 <https://bugs.launchpad.net/keystone/+bug/1649616>`_]
Significant improvements have been made when performing a token flush
on massive data sets.