diff options
| author | Zuul <zuul@review.openstack.org> | 2018-10-09 13:44:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-10-09 13:44:27 +0000 |
| commit | 89b32c215c1f3b0b4c245399758b076fc1eab36a (patch) | |
| tree | 52b73ccffa9661e80073de20d8a6acaa48aa995e | |
| parent | 53bc6b8c62e935e044f850e64ead725220ec3803 (diff) | |
| parent | a46f09ffc59ba69c5b63b2fb61b319267d3e7273 (diff) | |
| download | oslo-db-4.25.2.tar.gz | |
| -rw-r--r-- | oslo_db/sqlalchemy/enginefacade.py | 6 | ||||
| -rw-r--r-- | oslo_db/tests/sqlalchemy/test_enginefacade.py | 18 | ||||
| -rw-r--r-- | releasenotes/notes/fix_synchronous_reader-ca442ca9f07470ec.yaml | 8 |
3 files changed, 21 insertions, 11 deletions
diff --git a/oslo_db/sqlalchemy/enginefacade.py b/oslo_db/sqlalchemy/enginefacade.py index 752c6ca..22c5935 100644 --- a/oslo_db/sqlalchemy/enginefacade.py +++ b/oslo_db/sqlalchemy/enginefacade.py @@ -388,7 +388,8 @@ class _TransactionFactory(object): self._start() if mode is _WRITER: return self._writer_engine.connect() - elif self.synchronous_reader or mode is _ASYNC_READER: + elif mode is _ASYNC_READER or \ + (mode is _READER and not self.synchronous_reader): return self._reader_engine.connect() else: return self._writer_engine.connect() @@ -403,7 +404,8 @@ class _TransactionFactory(object): kw['bind'] = bind if mode is _WRITER: return self._writer_maker(**kw) - elif self.synchronous_reader or mode is _ASYNC_READER: + elif mode is _ASYNC_READER or \ + (mode is _READER and not self.synchronous_reader): return self._reader_maker(**kw) else: return self._writer_maker(**kw) diff --git a/oslo_db/tests/sqlalchemy/test_enginefacade.py b/oslo_db/tests/sqlalchemy/test_enginefacade.py index 303a8dd..5ca5f91 100644 --- a/oslo_db/tests/sqlalchemy/test_enginefacade.py +++ b/oslo_db/tests/sqlalchemy/test_enginefacade.py @@ -135,15 +135,15 @@ class MockFacadeTest(oslo_test_base.BaseTestCase): async_reader_maker = writer_maker if self.synchronous_reader: - reader_conn = async_reader_conn - reader_engine = async_reader_engine - reader_session = async_reader_session - reader_maker = async_reader_maker - else: reader_conn = writer_conn reader_engine = writer_engine reader_session = writer_session reader_maker = writer_maker + else: + reader_conn = async_reader_conn + reader_engine = async_reader_engine + reader_session = async_reader_session + reader_maker = async_reader_maker self.connections = AssertDataSource( writer_conn, reader_conn, async_reader_conn @@ -236,9 +236,9 @@ class MockFacadeTest(oslo_test_base.BaseTestCase): async_reader_engine = writer_engine if self.synchronous_reader: - reader_engine = async_reader_engine - else: reader_engine = writer_engine + else: + reader_engine = async_reader_engine engines = AssertDataSource( writer_engine, reader_engine, async_reader_engine) @@ -333,9 +333,9 @@ class MockFacadeTest(oslo_test_base.BaseTestCase): async_reader_maker = writer_maker if self.synchronous_reader: - reader_maker = async_reader_maker - else: reader_maker = writer_maker + else: + reader_maker = async_reader_maker makers = AssertDataSource( writer_maker, diff --git a/releasenotes/notes/fix_synchronous_reader-ca442ca9f07470ec.yaml b/releasenotes/notes/fix_synchronous_reader-ca442ca9f07470ec.yaml new file mode 100644 index 0000000..c842b7d --- /dev/null +++ b/releasenotes/notes/fix_synchronous_reader-ca442ca9f07470ec.yaml @@ -0,0 +1,8 @@ +--- +fixes: + - | + Repaired the "synchronous_reader" modifier of enginefacade so that it + refers to the "writer" engine when set to True, thereby allowing + "synchronous" behavior with the writer. When set to False, this is + "asynchronous", so this should be associated with the async engines. + The flag had the reverse behavior previously. |