diff options
| author | Zuul <zuul@review.opendev.org> | 2019-05-03 19:30:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-05-03 19:30:01 +0000 |
| commit | 7d9e9a894b23a418bbb9597e1f43bf8f5803d1d0 (patch) | |
| tree | ad9059c5f5b9402544286619e190863029bc66d9 | |
| parent | 3552185b23702019823cb9efbf34b46ef387192d (diff) | |
| parent | c114b932dbc7a2fe446b57bd08308fa85007c59f (diff) | |
| download | oslo-db-7d9e9a894b23a418bbb9597e1f43bf8f5803d1d0.tar.gz | |
Merge "exc_filters: fix deadlock detection for MariaDB/Galera cluster" into stable/queensqueens-em4.33.4
| -rw-r--r-- | oslo_db/sqlalchemy/exc_filters.py | 2 | ||||
| -rw-r--r-- | oslo_db/tests/sqlalchemy/test_exc_filters.py | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/oslo_db/sqlalchemy/exc_filters.py b/oslo_db/sqlalchemy/exc_filters.py index e42718b..6c12f59 100644 --- a/oslo_db/sqlalchemy/exc_filters.py +++ b/oslo_db/sqlalchemy/exc_filters.py @@ -63,6 +63,8 @@ def filters(dbname, exception_type, regex): @filters("mysql", sqla_exc.InternalError, r"^.*\b1213\b.*Deadlock found.*") @filters("mysql", sqla_exc.InternalError, r"^.*\b1213\b.*detected deadlock/conflict.*") +@filters("mysql", sqla_exc.InternalError, + r"^.*\b1213\b.*Deadlock: wsrep aborted.*") @filters("postgresql", sqla_exc.OperationalError, r"^.*deadlock detected.*") @filters("postgresql", sqla_exc.DBAPIError, r"^.*deadlock detected.*") @filters("ibm_db_sa", sqla_exc.DBAPIError, r"^.*SQL0911N.*") diff --git a/oslo_db/tests/sqlalchemy/test_exc_filters.py b/oslo_db/tests/sqlalchemy/test_exc_filters.py index 9c2b417..62b71a6 100644 --- a/oslo_db/tests/sqlalchemy/test_exc_filters.py +++ b/oslo_db/tests/sqlalchemy/test_exc_filters.py @@ -995,6 +995,12 @@ class TestDeadlock(TestsExceptionFilter): orig_exception_cls=self.InternalError ) + self._run_deadlock_detect_test( + "mysql", + "(1213, 'Deadlock: wsrep aborted transaction')", + orig_exception_cls=self.InternalError + ) + def test_mysql_pymysql_galera_deadlock(self): self._run_deadlock_detect_test( "mysql", |