Merge branch 'master' into remove-redis-cluster-logs

Author: nialdaly

README.md

@@ -1268,15 +1268,15 @@ Using scripting within pipelines in cluster mode is **not supported**.
      When set to true, read commands will be assigned between the
      primary and its replications in a Round-Robin manner.
      
- dynamic_startup_nodes: (default=False)
+ dynamic_startup_nodes: (default=True)
 
      Set the RedisCluster's startup nodes to all of the discovered nodes.
      If true, the cluster's discovered nodes will be used to determine the
      cluster nodes-slots mapping in the next topology refresh.
      It will remove the initial passed startup nodes if their endpoints aren't
      listed in the CLUSTER SLOTS output.
      If you use dynamic DNS endpoints for startup nodes but CLUSTER SLOTS lists
-     specific IP addresses, keep it at false.
+     specific IP addresses, it is best to set it to false.
      
  cluster_error_retry_attempts: (default=3)
 

redis/asyncio/cluster.py

@@ -23,7 +23,6 @@
 from redis.cluster import (
     PIPELINE_BLOCKED_COMMANDS,
     PRIMARY,
-    READ_COMMANDS,
     REPLICA,
     SLOT_ID,
     AbstractRedisCluster,
@@ -32,7 +31,7 @@
     get_node_name,
     parse_cluster_slots,
 )
-from redis.commands import AsyncRedisClusterCommands
+from redis.commands import READ_COMMANDS, AsyncRedisClusterCommands
 from redis.crc import REDIS_CLUSTER_HASH_SLOTS, key_slot
 from redis.exceptions import (
     AskError,
@@ -1350,11 +1349,17 @@ async def _execute(
 
         nodes = {}
         for cmd in todo:
-            target_nodes = await client._determine_nodes(*cmd.args)
-            if not target_nodes:
-                raise RedisClusterException(
-                    f"No targets were found to execute {cmd.args} command on"
+            passed_targets = cmd.kwargs.pop("target_nodes", None)
+            if passed_targets and not client._is_node_flag(passed_targets):
+                target_nodes = client._parse_target_nodes(passed_targets)
+            else:
+                target_nodes = await client._determine_nodes(
+                    *cmd.args, node_flag=passed_targets
                 )
+                if not target_nodes:
+                    raise RedisClusterException(
+                        f"No targets were found to execute {cmd.args} command on"
+                    )
             if len(target_nodes) > 1:
                 raise RedisClusterException(f"Too many targets for command {cmd.args}")
 

redis/client.py

@@ -310,7 +310,8 @@ def parse_xclaim(response, **options):
 def parse_xautoclaim(response, **options):
     if options.get("parse_justid", False):
         return response[1]
-    return parse_stream_list(response[1])
+    response[1] = parse_stream_list(response[1])
+    return response
 
 
 def parse_xinfo_stream(response, **options):

redis/cluster.py

@@ -8,7 +8,7 @@
 from typing import Any, Callable, Dict, Tuple
 
 from redis.client import CaseInsensitiveDict, PubSub, Redis, parse_scan
-from redis.commands import CommandsParser, RedisClusterCommands
+from redis.commands import READ_COMMANDS, CommandsParser, RedisClusterCommands
 from redis.connection import ConnectionPool, DefaultParser, Encoder, parse_url
 from redis.crc import REDIS_CLUSTER_HASH_SLOTS, key_slot
 from redis.exceptions import (
@@ -150,52 +150,6 @@ def parse_cluster_shards(resp, **options):
 )
 KWARGS_DISABLED_KEYS = ("host", "port")
 
-# Not complete, but covers the major ones
-# https://redis.io/commands
-READ_COMMANDS = frozenset(
-    [
-        "BITCOUNT",
-        "BITPOS",
-        "EXISTS",
-        "GEODIST",
-        "GEOHASH",
-        "GEOPOS",
-        "GEORADIUS",
-        "GEORADIUSBYMEMBER",
-        "GET",
-        "GETBIT",
-        "GETRANGE",
-        "HEXISTS",
-        "HGET",
-        "HGETALL",
-        "HKEYS",
-        "HLEN",
-        "HMGET",
-        "HSTRLEN",
-        "HVALS",
-        "KEYS",
-        "LINDEX",
-        "LLEN",
-        "LRANGE",
-        "MGET",
-        "PTTL",
-        "RANDOMKEY",
-        "SCARD",
-        "SDIFF",
-        "SINTER",
-        "SISMEMBER",
-        "SMEMBERS",
-        "SRANDMEMBER",
-        "STRLEN",
-        "SUNION",
-        "TTL",
-        "ZCARD",
-        "ZCOUNT",
-        "ZRANGE",
-        "ZSCORE",
-    ]
-)
-
 
 def cleanup_kwargs(**kwargs):
     """
@@ -478,7 +432,7 @@ def __init__(
         require_full_coverage=False,
         reinitialize_steps=10,
         read_from_replicas=False,
-        dynamic_startup_nodes=False,
+        dynamic_startup_nodes=True,
         url=None,
         **kwargs,
     ):
@@ -508,12 +462,12 @@ def __init__(
              primary and its replications in a Round-Robin manner.
          :dynamic_startup_nodes: 'bool'
              Set the RedisCluster's startup nodes to all of the discovered nodes.
-             If true, the cluster's discovered nodes will be used to determine the
-             cluster nodes-slots mapping in the next topology refresh.
+             If true (default value), the cluster's discovered nodes will be used to
+             determine the cluster nodes-slots mapping in the next topology refresh.
              It will remove the initial passed startup nodes if their endpoints aren't
              listed in the CLUSTER SLOTS output.
              If you use dynamic DNS endpoints for startup nodes but CLUSTER SLOTS lists
-             specific IP addresses, keep it at false.
+             specific IP addresses, it is best to set it to false.
         :cluster_error_retry_attempts: 'int'
              Retry command execution attempts when encountering ClusterDownError
              or ConnectionError
@@ -1265,7 +1219,7 @@ def __init__(
         from_url=False,
         require_full_coverage=False,
         lock=None,
-        dynamic_startup_nodes=False,
+        dynamic_startup_nodes=True,
         **kwargs,
     ):
         self.nodes_cache = {}
@@ -1951,14 +1905,25 @@ def _send_cluster_commands(
             # refer to our internal node -> slot table that
             # tells us where a given
             # command should route to.
-            node = self._determine_nodes(*c.args)
+            passed_targets = c.options.pop("target_nodes", None)
+            if passed_targets and not self._is_nodes_flag(passed_targets):
+                target_nodes = self._parse_target_nodes(passed_targets)
+            else:
+                target_nodes = self._determine_nodes(*c.args, node_flag=passed_targets)
+                if not target_nodes:
+                    raise RedisClusterException(
+                        f"No targets were found to execute {c.args} command on"
+                    )
+            if len(target_nodes) > 1:
+                raise RedisClusterException(f"Too many targets for command {c.args}")
 
+            node = target_nodes[0]
             # now that we know the name of the node
             # ( it's just a string in the form of host:port )
             # we can build a list of commands for each node.
-            node_name = node[0].name
+            node_name = node.name
             if node_name not in nodes:
-                redis_node = self.get_redis_connection(node[0])
+                redis_node = self.get_redis_connection(node)
                 connection = get_connection(redis_node, c.args)
                 nodes[node_name] = NodeCommands(
                     redis_node.parse_response, redis_node.connection_pool, connection

redis/commands/__init__.py

@@ -1,19 +1,20 @@
-from .cluster import AsyncRedisClusterCommands, RedisClusterCommands
+from .cluster import READ_COMMANDS, AsyncRedisClusterCommands, RedisClusterCommands
 from .core import AsyncCoreCommands, CoreCommands
 from .helpers import list_or_args
 from .parser import CommandsParser
 from .redismodules import AsyncRedisModuleCommands, RedisModuleCommands
 from .sentinel import AsyncSentinelCommands, SentinelCommands
 
 __all__ = [
+    "AsyncCoreCommands",
     "AsyncRedisClusterCommands",
-    "RedisClusterCommands",
+    "AsyncRedisModuleCommands",
+    "AsyncSentinelCommands",
     "CommandsParser",
-    "AsyncCoreCommands",
     "CoreCommands",
-    "list_or_args",
-    "AsyncRedisModuleCommands",
+    "READ_COMMANDS",
+    "RedisClusterCommands",
     "RedisModuleCommands",
-    "AsyncSentinelCommands",
     "SentinelCommands",
+    "list_or_args",
 ]