Merge ~niedbalski/ubuntu/+source/keystone:fix-1649616-ocata into ~ubuntu-server-dev/ubuntu/+source/keystone:stable/ocata

[Jorge Niedbalski]

    Cherry-picked fix for LP: #1649616.

72473a1... by Jorge Niedbalski on 2017-05-31

Merge branch 'stable/ocata' of git+ssh://git.launchpad.net/~ubuntu-server-dev/ubuntu/+source/keystone into fix-1649616-ocata

Signed-off-by: Jorge Niedbalski <email address hidden>

Unmerged commits

72473a1... by Jorge Niedbalski on 2017-05-31

Merge branch 'stable/ocata' of git+ssh://git.launchpad.net/~ubuntu-server-dev/ubuntu/+source/keystone into fix-1649616-ocata

Signed-off-by: Jorge Niedbalski <email address hidden>

8e7bb2a... by Jorge Niedbalski on 2017-05-31

Cherry-picked fix for LP: #1649616.

Signed-off-by: Jorge Niedbalski <email address hidden>

diff --git a/debian/changelog b/debian/changelog
index bf5874a..8bd3cf9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+keystone (2:11.0.0-0ubuntu2) zesty; urgency=high
+
+  * d/patches/0001-Make-flushing-tokens-more-robust.patch: Fixes
+   LP: #1649616.
+
+ -- Jorge Niedbalski <[e-mail]>  Wed, 31 May 2017 11:13:15 -0400
+
 keystone (2:11.0.0-0ubuntu1.1) zesty; urgency=medium
 
   * d/keystone.conf: Fix typo in combined log format (LP: #1671509).
diff --git a/debian/patches/0001-Make-flushing-tokens-more-robust.patch b/debian/patches/0001-Make-flushing-tokens-more-robust.patch
new file mode 100644
index 0000000..c36a00f
--- /dev/null
+++ b/debian/patches/0001-Make-flushing-tokens-more-robust.patch
@@ -0,0 +1,41 @@
+From 9c542d9d47b1223580baa8373b1856f4d9401617 Mon Sep 17 00:00:00 2001
+From: Peter Sabaini <[e-mail]>
+Date: Thu, 6 Apr 2017 23:06:29 +0200
+Subject: [PATCH] Make flushing tokens more robust
+
+Commit token flushes between batches in order to lower resource
+consumption and make flushing more robust for replication
+
+Change-Id: I9be37e420353a336a8acd820eadd47d4bcf7324f
+Closes-Bug: #1649616
+---
+ keystone/token/persistence/backends/sql.py | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/keystone/token/persistence/backends/sql.py b/keystone/token/persistence/backends/sql.py
+index ca89009..982ca31 100644
+--- a/keystone/token/persistence/backends/sql.py
++++ b/keystone/token/persistence/backends/sql.py
+@@ -277,6 +277,8 @@ class Token(token.persistence.TokenDriverBase):
+ 
+     def flush_expired_tokens(self):
+         with sql.session_for_write() as session:
++            # Turn off autocommit, as it doesn't work well with batch delete
++            session.autocommit = False
+             dialect = session.bind.dialect.name
+             expiry_range_func = self._expiry_range_strategy(dialect)
+             query = session.query(TokenModel.expires)
+@@ -286,6 +288,10 @@ class Token(token.persistence.TokenDriverBase):
+                 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()
+                 total_removed += row_count
+                 LOG.debug('Removed %d total expired tokens', total_removed)
+ 
+-- 
+2.7.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 538cc44..87733b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+0001-Make-flushing-tokens-more-robust.patch
 sql_connection.patch
 ubuntu-test-overrides.patch
 default-log-dir.patch