Skip to content
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

Fixed issue with invoking _close() on closed event loop #3438

Merged
merged 11 commits into from
Dec 5, 2024
Merged

Fixed issue with invoking _close() on closed event loop #3438

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ecf10fe
Fixed issue with invoking _close() on closed event loop
vladvildanov Nov 18, 2024
4ba798a
Removed unused import
vladvildanov Nov 18, 2024
28eee0c
Merge branch 'master' of github.com:redis/redis-py into vv-3431-fix
vladvildanov Dec 5, 2024
c0d24e6
Revert weakref changes
vladvildanov Dec 5, 2024
05e48d3
Codestyle fix
vladvildanov Dec 5, 2024
dcb2d98
Added test coverage
vladvildanov Dec 5, 2024
c403a9f
Codestyle fixes
vladvildanov Dec 5, 2024
fa38892
Codestyle fixes
vladvildanov Dec 5, 2024
f5040d8
Removed failure check that fails in 3.12
vladvildanov Dec 5, 2024
cc619c0
Codestyle fixes
vladvildanov Dec 5, 2024
bd71391
Codestyle fixes
vladvildanov Dec 5, 2024
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
8 changes: 7 additions & 1 deletion redis/asyncio/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,13 @@ def __del__(self, _warnings: Any = warnings):
_warnings.warn(
f"unclosed Connection {self!r}", ResourceWarning, source=self
)
self._close()

try:
asyncio.get_running_loop()
self._close()
except RuntimeError:
# No actions been taken if pool already closed.
pass

def _close(self):
"""
Expand Down
3 changes: 1 addition & 2 deletions redis/asyncio/sentinel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import asyncio
import random
import weakref
from typing import AsyncIterator, Iterable, Mapping, Optional, Sequence, Tuple, Type

from redis.asyncio.client import Redis
Expand Down Expand Up @@ -117,7 +116,7 @@ def __init__(self, service_name, sentinel_manager, **kwargs):
self.is_master = kwargs.pop("is_master", True)
self.check_connection = kwargs.pop("check_connection", False)
super().__init__(**kwargs)
self.connection_kwargs["connection_pool"] = weakref.proxy(self)
self.connection_kwargs["connection_pool"] = self
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This sort of change has me wonder why it was a weakref in the first place – probably for a reason?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same concerns here as @akx. We need to ensure with a test that it doesn't create a circular reference and prevents garbage collecting unused SentinelConnectionPool objects.

Copy link
Collaborator Author

@vladvildanov vladvildanov Nov 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But isn't it already covered by current tests in test_sentinel.py? I mean, GC is always take in action after the tests been executed. I also had a doubts about this, but I didn't find any reason why weakref was used and current tests works as expected. Do you have a specific test case in mind that is worth to add?

self.service_name = service_name
self.sentinel_manager = sentinel_manager
self.master_address = None
Expand Down
Loading