diff options
author | robot-kikimr-dev <robot-kikimr-dev@yandex-team.com> | 2023-05-22 12:31:36 +0300 |
---|---|---|
committer | robot-kikimr-dev <robot-kikimr-dev@yandex-team.com> | 2023-05-22 12:31:36 +0300 |
commit | 65d9f1f53c013e9b46c3999849db844de5aef4d1 (patch) | |
tree | 8fdacb5a7cf48143e2ae3b9fc702716c676a784d | |
parent | 1f69bcf7cb932454c79897d3c2ee8d530382d5ce (diff) | |
download | ydb-65d9f1f53c013e9b46c3999849db844de5aef4d1.tar.gz |
YDB SDK Sync from git
-rw-r--r-- | ydb/public/sdk/python3/ydb/_topic_writer/topic_writer_asyncio.py | 10 | ||||
-rw-r--r-- | ydb/public/sdk/python3/ydb/_topic_writer/topic_writer_sync.py | 6 | ||||
-rw-r--r-- | ydb/public/sdk/python3/ydb/aio/pool.py | 2 | ||||
-rw-r--r-- | ydb/public/sdk/python3/ydb/pool.py | 3 | ||||
-rw-r--r-- | ydb/public/sdk/python3/ydb/ydb_version.py | 2 |
5 files changed, 18 insertions, 5 deletions
diff --git a/ydb/public/sdk/python3/ydb/_topic_writer/topic_writer_asyncio.py b/ydb/public/sdk/python3/ydb/_topic_writer/topic_writer_asyncio.py index 30ab9fb3c39..d83187fc1b7 100644 --- a/ydb/public/sdk/python3/ydb/_topic_writer/topic_writer_asyncio.py +++ b/ydb/public/sdk/python3/ydb/_topic_writer/topic_writer_asyncio.py @@ -65,7 +65,11 @@ class WriterAsyncIO: return self async def __aexit__(self, exc_type, exc_val, exc_tb): - await self.close() + try: + await self.close() + except BaseException: + if exc_val is None: + raise def __del__(self): if self._closed or self._loop.is_closed(): @@ -330,7 +334,7 @@ class WriterAsyncIOReconnector: def _check_stop(self): if self._stop_reason.done(): - raise self._stop_reason.result() + raise self._stop_reason.exception() async def _connection_loop(self): retry_settings = RetrySettings() # todo @@ -543,7 +547,7 @@ class WriterAsyncIOReconnector: if self._stop_reason.done(): return - self._stop_reason.set_result(reason) + self._stop_reason.set_exception(reason) for f in self._messages_future: f.set_exception(reason) diff --git a/ydb/public/sdk/python3/ydb/_topic_writer/topic_writer_sync.py b/ydb/public/sdk/python3/ydb/_topic_writer/topic_writer_sync.py index 43c4fec92ec..a5193caf7c5 100644 --- a/ydb/public/sdk/python3/ydb/_topic_writer/topic_writer_sync.py +++ b/ydb/public/sdk/python3/ydb/_topic_writer/topic_writer_sync.py @@ -56,7 +56,11 @@ class WriterSync: return self def __exit__(self, exc_type, exc_val, exc_tb): - self.close() + try: + self.close() + except BaseException: + if exc_val is None: + raise def __del__(self): self.close(flush=False) diff --git a/ydb/public/sdk/python3/ydb/aio/pool.py b/ydb/public/sdk/python3/ydb/aio/pool.py index 08bfaacb76f..6e95dd6fe10 100644 --- a/ydb/public/sdk/python3/ydb/aio/pool.py +++ b/ydb/public/sdk/python3/ydb/aio/pool.py @@ -241,6 +241,8 @@ class ConnectionPool(IConnectionPool): preferred_endpoint=None, fast_fail=False, ): + if self._stopped: + raise issues.Error("Driver was stopped") wait_timeout = settings.timeout if settings else 10 try: connection = await self._store.get(preferred_endpoint, fast_fail=fast_fail, wait_timeout=wait_timeout) diff --git a/ydb/public/sdk/python3/ydb/pool.py b/ydb/public/sdk/python3/ydb/pool.py index 736344e3bee..e0bf2f15876 100644 --- a/ydb/public/sdk/python3/ydb/pool.py +++ b/ydb/public/sdk/python3/ydb/pool.py @@ -429,6 +429,9 @@ class ConnectionPool(IConnectionPool): :return: A result of computation """ + if self._stopped: + raise issues.Error("Driver was stopped") + tracing.trace(self.tracer, {"request": request, "stub": stub, "rpc_name": rpc_name}) try: connection = self._store.get(preferred_endpoint) diff --git a/ydb/public/sdk/python3/ydb/ydb_version.py b/ydb/public/sdk/python3/ydb/ydb_version.py index 19cbee25e12..5a43db3f46d 100644 --- a/ydb/public/sdk/python3/ydb/ydb_version.py +++ b/ydb/public/sdk/python3/ydb/ydb_version.py @@ -1 +1 @@ -VERSION = "3.3.2" +VERSION = "3.3.3" |