Merge 6aafe64523 into 1ce6e78dd4

django/core/cache/__init__.py

@@ -44,6 +44,7 @@ class CacheHandler(BaseConnectionHandler):
         params = self.settings[alias].copy()
         backend = params.pop("BACKEND")
         location = params.pop("LOCATION", "")
+        params["ALIAS"] = alias
         try:
             backend_cls = import_string(backend)
         except ImportError as e:

django/core/cache/backends/base.py

@@ -82,6 +82,7 @@ class BaseCache:
 
         self.key_prefix = params.get("KEY_PREFIX", "")
         self.version = params.get("VERSION", 1)
+        self.alias = params.get("ALIAS", "default")
         self.key_func = get_key_func(params.get("KEY_FUNCTION"))
 
     def get_backend_timeout(self, timeout=DEFAULT_TIMEOUT):

django/core/cache/backends/redis.py

@@ -29,9 +29,12 @@ class RedisSerializer:
 
 
 class RedisCacheClient:
+    _pools = {}
+
     def __init__(
         self,
         servers,
+        alias=None,
         serializer=None,
         pool_class=None,
         parser_class=None,
@@ -41,7 +44,7 @@ class RedisCacheClient:
 
         self._lib = redis
         self._servers = servers
-        self._pools = {}
+        self._alias = alias
 
         self._client = self._lib.Redis
 
@@ -70,12 +73,17 @@ class RedisCacheClient:
 
     def _get_connection_pool(self, write):
         index = self._get_connection_pool_index(write)
-        if index not in self._pools:
+        key = f"{self._alias}:{index}"
-            self._pools[index] = self._pool_class.from_url(
+
-                self._servers[index],
+        if key not in self._pools:
-                **self._pool_options,
+            self._pools.setdefault(
+                key,
+                self._pool_class.from_url(
+                    self._servers[index],
+                    **self._pool_options,
+                ),
             )
-        return self._pools[index]
+        return self._pools[key]
 
     def get_client(self, key=None, *, write=False):
         # key is used so that the method signature remains the same and custom
@@ -170,7 +178,7 @@ class RedisCache(BaseCache):
 
     @cached_property
     def _cache(self):
-        return self._class(self._servers, **self._options)
+        return self._class(self._servers, alias=self.alias, **self._options)
 
     def get_backend_timeout(self, timeout=DEFAULT_TIMEOUT):
         if timeout == DEFAULT_TIMEOUT:

tests/cache/tests.py

@@ -1831,6 +1831,10 @@ class RedisCacheTests(BaseCacheTests, TestCase):
         super().setUp()
         self.lib = redis
 
+        # Clear pools, because the pool is process-global,
+        # so every case will use the pools created in previous cases
+        self.addCleanup(cache._cache._pools.clear)
+
     @property
     def incr_decr_type_error(self):
         return self.lib.ResponseError
@@ -1902,6 +1906,28 @@ class RedisCacheTests(BaseCacheTests, TestCase):
         self.assertEqual(pool.connection_kwargs["socket_timeout"], 0.1)
         self.assertIs(pool.connection_kwargs["retry_on_timeout"], True)
 
+    def test_redis_pool_is_global(self):
+
+        class ResultContainer:
+            def __init__(self):
+                self.result1 = None
+                self.result2 = None
+
+        result = ResultContainer()
+
+        def get_connection_pool(result, slot):
+            setattr(result, slot, cache._cache._get_connection_pool(write=False))
+
+        t1 = threading.Thread(target=get_connection_pool, args=(result, "result1"))
+        t2 = threading.Thread(target=get_connection_pool, args=(result, "result2"))
+
+        t1.start()
+        t2.start()
+        t1.join()
+        t2.join()
+
+        self.assertEqual(id(result.result1), id(result.result2))
+
 
 class FileBasedCachePathLibTests(FileBasedCacheTests):
     def mkdtemp(self):