Implement redis retries

acoustid/script.py

@@ -6,6 +6,8 @@
 from optparse import OptionParser
 from typing import Any, Optional
 
+import redis.retry
+import redis.backoff
 from redis import Redis
 from redis.sentinel import Sentinel as RedisSentinel
 from statsd import StatsClient
@@ -63,16 +65,20 @@ def __init__(self, config_path, tests=False):
         self.redis = None
         self.redis_sentinel = None
 
+        redis_retry = redis.retry.Retry(redis.backoff.ExponentialBackoff(), 2)
+
         if self.config.redis.sentinel:
             self.redis_sentinel = RedisSentinel(
                 [(self.config.redis.host, self.config.redis.port)],
                 password=self.config.redis.password,
+                retry=redis_retry,
             )
         else:
             self.redis = Redis(
                 host=self.config.redis.host,
                 port=self.config.redis.port,
                 password=self.config.redis.password,
+                retry=redis_retry,
             )
 
         self._console_logging_configured = False

requirements.in

@@ -5,7 +5,7 @@ Jinja2
 python-openid; python_version < "3"
 python3-openid; python_version >= "3"
 Markdown
-redis
+redis>=5
 flask>=2
 rauth
 cryptography>=3.3.2

requirements.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.8
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
 #    pip-compile --output-file=requirements.txt requirements.in
@@ -44,8 +44,6 @@ gunicorn==20.1.0
     # via -r requirements.in
 idna==2.8
     # via requests
-importlib-metadata==7.0.1
-    # via flask
 itsdangerous==2.1.2
     # via flask
 jinja2==3.1.3
@@ -89,7 +87,7 @@ pytz==2019.3
     # via -r requirements.in
 rauth==0.7.3
     # via -r requirements.in
-redis==4.4.4
+redis==5.0.1
     # via -r requirements.in
 requests==2.31.0
     # via
@@ -116,8 +114,6 @@ werkzeug==2.3.8
     # via
     #   -r requirements.in
     #   flask
-zipp==3.17.0
-    # via importlib-metadata
 zope-event==4.5.0
     # via gevent
 zope-interface==5.2.0

requirements_dev.in

@@ -10,4 +10,4 @@ types-requests ; python_version >= "3"
 types-click ; python_version >= "3"
 types-six ; python_version >= "3"
 types-pytz ; python_version >= "3"
-types-redis ; python_version >= "3"
+types-redis>=4.6.0

requirements_dev.txt

@@ -1,15 +1,24 @@
 #
-# This file is autogenerated by pip-compile with Python 3.8
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
 #    pip-compile --output-file=requirements_dev.txt requirements_dev.in
 #
 black==23.3.0
     # via -r requirements_dev.in
+cffi==1.15.1
+    # via
+    #   -c requirements.txt
+    #   cryptography
 click==8.1.3
     # via
     #   -c requirements.txt
     #   black
+cryptography==39.0.1
+    # via
+    #   -c requirements.txt
+    #   types-pyopenssl
+    #   types-redis
 exceptiongroup==1.1.1
     # via pytest
 flake8==5.0.4
@@ -40,6 +49,10 @@ pluggy==1.0.0
     # via pytest
 pycodestyle==2.9.1
     # via flake8
+pycparser==2.19
+    # via
+    #   -c requirements.txt
+    #   cffi
 pyflakes==2.5.0
     # via flake8
 pytest==7.3.1
@@ -53,16 +66,17 @@ tomli==1.2.3
     #   pytest
 types-click==7.1.5 ; python_version >= "3"
     # via -r requirements_dev.in
+types-pyopenssl==24.0.0.20240130
+    # via types-redis
 types-pytz==2021.1.2 ; python_version >= "3"
     # via -r requirements_dev.in
-types-redis==3.5.6 ; python_version >= "3"
+types-redis==4.6.0.20240218
     # via -r requirements_dev.in
 types-requests==2.25.6 ; python_version >= "3"
     # via -r requirements_dev.in
 types-six==0.1.9 ; python_version >= "3"
     # via -r requirements_dev.in
 typing-extensions==3.10.0.0
     # via
-    #   black
     #   mypy
     #   sqlalchemy-stubs

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py3.8, py3.10, mypy, flake8, isort, black
+envlist = py3.10, mypy, flake8, isort, black
 skip_missing_interpreters = true
 skipsdist = true
 
@@ -12,29 +12,29 @@ deps =
 commands = pytest -v tests/
 
 [testenv:mypy]
-basepython = python3
+basepython = python3.10
 skip_install = true
 deps =
   -rrequirements.txt
   -rrequirements_dev.txt
 commands = mypy acoustid/ tests/
 
 [testenv:flake8]
-basepython = python3
+basepython = python3.10
 skip_install = true
 deps =
   -rrequirements_dev.txt
 commands = flake8 acoustid/ tests/
 
 [testenv:isort]
-basepython = python3
+basepython = python3.10
 skip_install = true
 deps =
   -rrequirements_dev.txt
 commands = isort --check acoustid/ tests/
 
 [testenv:black]
-basepython = python3
+basepython = python3.10
 skip_install = true
 deps =
   -rrequirements_dev.txt