From 2ba375fc93997fca6b621c9f433b49b593334ebb Mon Sep 17 00:00:00 2001 From: Eli$ Date: Fri, 1 Aug 2025 17:23:05 +0200 Subject: [PATCH] Add `pool_timeout` and fix buggy connection pool locking Fixes a bug where the previous locking strategy caused unnecessary contention and could block all threads even when connections were available. --- .../lib/mysql/connector/pooling.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/mysql-connector-python/lib/mysql/connector/pooling.py b/mysql-connector-python/lib/mysql/connector/pooling.py index a5b3657e..3e9ebd93 100644 --- a/mysql-connector-python/lib/mysql/connector/pooling.py +++ b/mysql-connector-python/lib/mysql/connector/pooling.py @@ -439,6 +439,7 @@ def __init__( pool_size: int = 5, pool_name: Optional[str] = None, pool_reset_session: bool = True, + pool_timeout: int = 5, **kwargs: Any, ) -> None: """Constructor. @@ -456,6 +457,10 @@ def __init__( pool_size: The pool size. If this argument is not given, the default is 5. pool_reset_session: Whether to reset session variables when the connection is returned to the pool. + pool_timeout: The maximum number of seconds to wait when attempting to retrieve + a connection from the pool. If no connection becomes available + before the timeout expires, a `PoolError` is raised indicating + that the pool is exhausted. **kwargs: Optional additional connection arguments, as described in [1]. Examples: @@ -475,6 +480,7 @@ def __init__( self._pool_size: Optional[int] = None self._pool_name: Optional[str] = None self._reset_session = pool_reset_session + self._pool_timeout: int = pool_timeout self._set_pool_size(pool_size) self._set_pool_name(pool_name or generate_pool_name(**kwargs)) self._cnx_config: Dict[str, Any] = {} @@ -649,12 +655,12 @@ def get_connection(self) -> PooledMySQLConnection: Raises: PoolError: On errors. """ + try: + cnx = self._cnx_queue.get(block=True, timeout=self._pool_timeout) + except queue.Empty as err: + raise PoolError("Failed getting connection; pool exhausted") from err + with CONNECTION_POOL_LOCK: - try: - cnx = self._cnx_queue.get(block=False) - except queue.Empty as err: - raise PoolError("Failed getting connection; pool exhausted") from err - if ( not cnx.is_connected() or self._config_version != cnx.pool_config_version pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy