From b950cf8cf41eb3af919ac0ab18b4f3a37419e826 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 14 Feb 2024 11:40:12 +0900 Subject: [PATCH] redis: Fix wrong type used to parse socket_keepalive The socket_keepalive option in RedisClient is not an integer but a boolean. This fixes the type to parse the options accordingly. Note this change still keeps support for socket_keepalive=1 or socket_keepalive=0 , but would remove support for the other integer values such as 2 or -1. Change-Id: I47b8628b9676f37ab5bb82b0fa9e45fcff679893 --- ...fix-redis-socket_keepalive-type-32b41b746f426efb.yaml | 9 +++++++++ tooz/drivers/redis.py | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/fix-redis-socket_keepalive-type-32b41b746f426efb.yaml diff --git a/releasenotes/notes/fix-redis-socket_keepalive-type-32b41b746f426efb.yaml b/releasenotes/notes/fix-redis-socket_keepalive-type-32b41b746f426efb.yaml new file mode 100644 index 00000000..448b9c2b --- /dev/null +++ b/releasenotes/notes/fix-redis-socket_keepalive-type-32b41b746f426efb.yaml @@ -0,0 +1,9 @@ +--- +upgrade: + - | + The ``socket_keepalive`` option of redis driver no longer accepts integers + other than 0 and 1. + +fixes: + - | + The ``socket_keepalive`` option of redis driver now accepts boolean values. diff --git a/tooz/drivers/redis.py b/tooz/drivers/redis.py index 11a4ab3b..74f7562c 100644 --- a/tooz/drivers/redis.py +++ b/tooz/drivers/redis.py @@ -285,13 +285,13 @@ class RedisDriver(coordination.CoordinationDriverCachedRunWatchers, #: Client arguments that are expected to be boolean convertible. CLIENT_BOOL_ARGS = frozenset([ 'retry_on_timeout', + 'socket_keepalive', 'ssl', ]) #: Client arguments that are expected to be int convertible. CLIENT_INT_ARGS = frozenset([ 'db', - 'socket_keepalive', ]) #: Client arguments that are expected to be float convertible.