diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-05-22 18:42:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-05-22 18:42:53 +0000 |
| commit | d36ccea6244d916d896f695b2742e7e4f8966825 (patch) | |
| tree | 5d8927bee329cda00c1c0b6193425ba1740eb051 | |
| parent | 9fe59b628b3fe77e571f1667e9477b37460217de (diff) | |
| parent | f4a77dc0c13f4bb9e45298412d0b36bc476b2afd (diff) | |
| download | oslo-db-d36ccea6244d916d896f695b2742e7e4f8966825.tar.gz | |
Merge "Ensure that create_engine() close test connection"
| -rw-r--r-- | oslo_db/sqlalchemy/session.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/oslo_db/sqlalchemy/session.py b/oslo_db/sqlalchemy/session.py index f243652..0dae851 100644 --- a/oslo_db/sqlalchemy/session.py +++ b/oslo_db/sqlalchemy/session.py @@ -411,7 +411,11 @@ def create_engine(sql_connection, sqlite_fk=False, mysql_sql_mode=None, event.listen(engine, "engine_connect", _connect_ping_listener) # initial connect + test - _test_connection(engine, max_retries, retry_interval) + # NOTE(viktors): the current implementation of _test_connection() + # does nothing, if max_retries == 0, so we can skip it + if max_retries: + test_conn = _test_connection(engine, max_retries, retry_interval) + test_conn.close() return engine |