From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 29 Jan 2016 17:19:17 +0000 (-0500)
Subject: - put a retry in for PG database provisioning as it locks
X-Git-Tag: rel_1_1_0b1~98^2~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8b3d4ed3f2638599fc73486cf0f724fa033a638;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- put a retry in for PG database provisioning as it locks
on database use
---

diff --git a/lib/sqlalchemy/testing/provision.py b/lib/sqlalchemy/testing/provision.py
index 3f9ddae73c..ce60e99d3c 100644
--- a/lib/sqlalchemy/testing/provision.py
+++ b/lib/sqlalchemy/testing/provision.py
@@ -1,8 +1,10 @@
 from sqlalchemy.engine import url as sa_url
 from sqlalchemy import text
+from sqlalchemy import exc
 from sqlalchemy.util import compat
 from . import config, engines
 import os
+import time
 
 FOLLOWER_IDENT = None
 
@@ -158,7 +160,18 @@ def _pg_create_db(cfg, eng, ident):
         except Exception:
             pass
         currentdb = conn.scalar("select current_database()")
-        conn.execute("CREATE DATABASE %s TEMPLATE %s" % (ident, currentdb))
+        for attempt in range(3):
+            try:
+                conn.execute(
+                    "CREATE DATABASE %s TEMPLATE %s" % (ident, currentdb))
+            except exc.OperationalError as err:
+                if attempt != 2 and "accessed by other users" in str(err):
+                    time.sleep(.2)
+                    continue
+                else:
+                    raise
+            else:
+                break
 
 
 @_create_db.for_db("mysql")