Skip to content

fix: add TimeoutError handling in get_connection() #1485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Mar 18, 2025
Merged

fix: add TimeoutError handling in get_connection() #1485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
59ab61f
fix: add TimeoutError handling in get_connection()
donbowman May 20, 2021
a7fb844
Merge remote-tracking branch 'upstream/master' into connection-pool-fix
donbowman May 23, 2022
08ad674
Merge branch 'master' into connection-pool-fix
donbowman Jun 21, 2024
20f62da
Merge branch 'connection-pool-fix' of github.com:Agilicus/redis-py in…
donbowman Jun 21, 2024
50f2c98
Merge branch 'master' into connection-pool-fix
donbowman Jun 21, 2024
00751b0
Merge remote-tracking branch 'upstream/master' into connection-pool-fix
donbowman Mar 13, 2025
05c12e0
fix: add TimeoutError handling in get_connection() sync/async
donbowman Mar 18, 2025
302e89e
fix: update version number to match test expectations
donbowman Mar 18, 2025
b265df8
Merge branch 'master' into connection-pool-fix
donbowman Mar 18, 2025
42d0da9
fix: revert version number to 5.2.1, manually uninstall entraid
donbowman Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion redis/asyncio/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1157,7 +1157,7 @@ async def ensure_connection(self, connection: AbstractConnection):
try:
if await connection.can_read_destructive():
raise ConnectionError("Connection has data") from None
except (ConnectionError, OSError):
except (ConnectionError, TimeoutError, OSError):
await connection.disconnect()
await connection.connect()
if await connection.can_read_destructive():
Expand Down
4 changes: 2 additions & 2 deletions redis/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1494,7 +1494,7 @@ def get_connection(self, command_name=None, *keys, **options) -> "Connection":
try:
if connection.can_read() and self.cache is None:
raise ConnectionError("Connection has data")
except (ConnectionError, OSError):
except (ConnectionError, TimeoutError, OSError):
connection.disconnect()
connection.connect()
if connection.can_read():
Expand Down Expand Up @@ -1741,7 +1741,7 @@ def get_connection(self, command_name=None, *keys, **options):
try:
if connection.can_read():
raise ConnectionError("Connection has data")
except (ConnectionError, OSError):
except (ConnectionError, TimeoutError, OSError):
connection.disconnect()
connection.connect()
if connection.can_read():
Expand Down
Loading