Skip to content

TransactionStrategy reset: UNWATCH only when status is watching #3671

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 2 commits into from
Jun 11, 2025
Merged

TransactionStrategy reset: UNWATCH only when status is watching #3671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7577492
TransactionStrategy reset: UNWATCH only when status is watching
tzongw Jun 6, 2025
9b84371
Merge branch 'master' into master
petyaslavova Jun 11, 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
9 changes: 5 additions & 4 deletions redis/asyncio/cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2350,10 +2350,11 @@ async def reset(self):
# watching something
if self._transaction_connection:
try:
# call this manually since our unwatch or
# immediate_execute_command methods can call reset()
await self._transaction_connection.send_command("UNWATCH")
await self._transaction_connection.read_response()
if self._watching:
# call this manually since our unwatch or
# immediate_execute_command methods can call reset()
await self._transaction_connection.send_command("UNWATCH")
await self._transaction_connection.read_response()
# we can safely return the connection to the pool here since we're
# sure we're no longer WATCHing anything
self._transaction_node.release(self._transaction_connection)
Expand Down
9 changes: 5 additions & 4 deletions redis/cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3289,10 +3289,11 @@ def reset(self):
# watching something
if self._transaction_connection:
try:
# call this manually since our unwatch or
# immediate_execute_command methods can call reset()
self._transaction_connection.send_command("UNWATCH")
self._transaction_connection.read_response()
if self._watching:
# call this manually since our unwatch or
# immediate_execute_command methods can call reset()
self._transaction_connection.send_command("UNWATCH")
self._transaction_connection.read_response()
# we can safely return the connection to the pool here since we're
# sure we're no longer WATCHing anything
node = self._nodes_manager.find_connection_owner(
Expand Down
Loading