Fixed issue with Sentinel killing healthcheck thread before execution

Author: vladvildanov

redis/connection.py

@@ -1307,13 +1307,7 @@ def __init__(
         # release the lock.
         self._fork_lock = threading.Lock()
         self.reset()
-
-        # Run scheduled healthcheck to avoid stale invalidations in idle connections.
-        if self.cache is not None and self._scheduler is not None:
-            self._hc_cancel_event = threading.Event()
-            self._hc_thread = self._scheduler.run_with_interval(
-                self._perform_health_check, 2, self._hc_cancel_event
-            )
+        self.run_scheduled_healthcheck()
 
     def __repr__(self) -> (str, str):
         return (
@@ -1513,6 +1507,14 @@ def set_retry(self, retry: "Retry") -> None:
         for conn in self._in_use_connections:
             conn.retry = retry
 
+    def run_scheduled_healthcheck(self) -> None:
+        # Run scheduled healthcheck to avoid stale invalidations in idle connections.
+        if self.cache is not None and self._scheduler is not None:
+            self._hc_cancel_event = threading.Event()
+            self._hc_thread = self._scheduler.run_with_interval(
+                self._perform_health_check, 2, self._hc_cancel_event
+            )
+
     def _perform_health_check(self, done: threading.Event) -> None:
         self._checkpid()
         with self._lock:

redis/sentinel.py

@@ -115,6 +115,7 @@ def get_master_address(self):
             connection_pool = self.connection_pool_ref()
             if connection_pool is not None:
                 connection_pool.disconnect(inuse_connections=False)
+                connection_pool.run_scheduled_healthcheck()
         return master_address
 
     def rotate_slaves(self):

tests/test_cache.py

@@ -1,4 +1,3 @@
-import threading
 import time
 
 import pytest
@@ -38,7 +37,7 @@ def r(request):
 
 @pytest.mark.skipif(HIREDIS_AVAILABLE, reason="PythonParser only")
 @pytest.mark.onlynoncluster
-# @skip_if_resp_version(2)
+@skip_if_resp_version(2)
 class TestCache:
     @pytest.mark.parametrize(
         "r",