From 761c8ff15de16e572a6e1382cae76d734bd411e7 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Wed, 26 Mar 2014 16:31:52 -0400 Subject: - work on fixing some race-condition failures: 1. make sure pool._invalidate() sets the timestamp up before invalidating the target connection. we can otherwise show how the conn.invalidate() + pool._invalidate() can lead to an extra connection being made. 2. to help with that, soften up the check on connection.invalidate() when connection is already closed. a warning is fine here 3. add a mutex to test_max_overflow() when we connect, because the way we're using mock depends on an iterator, that needs to be synchronized --- lib/sqlalchemy/engine/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/sqlalchemy/engine/base.py') diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py index 6e1564c34..9f656cac8 100644 --- a/lib/sqlalchemy/engine/base.py +++ b/lib/sqlalchemy/engine/base.py @@ -1115,8 +1115,8 @@ class Connection(Connectable): if self._is_disconnect: del self._is_disconnect dbapi_conn_wrapper = self.connection + self.engine.pool._invalidate(dbapi_conn_wrapper, e) self.invalidate(e) - self.engine.pool._invalidate(dbapi_conn_wrapper) if self.should_close_with_result: self.close() -- cgit v1.2.1