Skip to content

Commit

Permalink
Fix KeyError in async cluster - initialize before execute multi key c…
Browse files Browse the repository at this point in the history
…ommands (#2439)

* Fix KeyError in async cluster

* link to issue

* typo
  • Loading branch information
dvora-h authored and chayim committed Nov 21, 2022
1 parent 3081430 commit 13c27ca
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 0 deletions.
19 changes: 19 additions & 0 deletions redis/commands/cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,25 @@ async def _split_command_across_slots(self, command: str, *keys: KeyT) -> int:
# Sum up the reply from each command
return sum(await self._execute_pipeline_by_slot(command, slots_to_keys))

async def _execute_pipeline_by_slot(
self, command: str, slots_to_args: Mapping[int, Iterable[EncodableT]]
) -> List[Any]:
if self._initialize:
await self.initialize()
read_from_replicas = self.read_from_replicas and command in READ_COMMANDS
pipe = self.pipeline()
[
pipe.execute_command(
command,
*slot_args,
target_nodes=[
self.nodes_manager.get_node_from_slot(slot, read_from_replicas)
],
)
for slot, slot_args in slots_to_args.items()
]
return await pipe.execute()


class ClusterManagementCommands(ManagementCommands):
"""
Expand Down
9 changes: 9 additions & 0 deletions tests/test_asyncio/test_cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -812,6 +812,15 @@ async def test_unlink(self, r: RedisCluster) -> None:
await asyncio.sleep(0.1)
assert await r.unlink(*d.keys()) == 0

async def test_initialize_before_execute_multi_key_command(
self, request: FixtureRequest
) -> None:
# Test for issue https://github.com/redis/redis-py/issues/2437
url = request.config.getoption("--redis-url")
r = RedisCluster.from_url(url)
assert 0 == await r.exists("a", "b", "c")
await r.close()

@skip_if_redis_enterprise()
async def test_cluster_myid(self, r: RedisCluster) -> None:
node = r.get_random_node()
Expand Down

0 comments on commit 13c27ca

Please sign in to comment.