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

[Jorge Niedbalski]

Cherry-picked fix for LP: #1649616.

Unmerged commits

dfba751... 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 39d8e11..8a35a4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 keystone (2:12.0.0~b1-0ubuntu3) UNRELEASED; urgency=medium
 
+  [ James Page ]
   * d/control: Bump minimum migration version to 0.11.0.
   * d/rules,control,keystone.conf.dist: Refactor defaults management
     to use crudini.
 
+  [ Jorge Niedbalski ]
+  * d/patches/0001-Make-flushing-tokens-more-robust.patch: Fixes
+   LP: #1649616.
+
  -- James Page <[e-mail]>  Thu, 25 May 2017 10:00:20 +0100
 
 keystone (2:12.0.0~b1-0ubuntu2) artful; urgency=medium
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..3a12b9f
--- /dev/null
+++ b/debian/patches/0001-Make-flushing-tokens-more-robust.patch
@@ -0,0 +1,41 @@
+From f56d5f7cda6dccb1890b1c00c582477e90b6f2d4 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 0900aca..0d1acc5 100644
+--- a/keystone/token/persistence/backends/sql.py
++++ b/keystone/token/persistence/backends/sql.py
+@@ -276,6 +276,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)
+@@ -285,6 +287,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 79f267c..4c7f04b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+0001-Make-flushing-tokens-more-robust.patch
 add-version-info.patch
 add-missing-manifest.patch