mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-05 03:29:12 +00:00
Code Issues 32 Releases Wiki Activity

35651 Fixed Reusing RedisCacheClient Connections for multiple requests.

Browse Source
This commit is contained in:
Ankit Jhunjhunwala 2024-08-08 00:42:38 +05:30
parent 790f0f8868
commit 94a5c38245
2 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
django/core/cache/backends/redis.py vendored
View File

@ -4,6 +4,8 @@ import pickle
import random import random
import re import re
from redis.connection import parse_url
from django.core.cache.backends.base import DEFAULT_TIMEOUT, BaseCache from django.core.cache.backends.base import DEFAULT_TIMEOUT, BaseCache
from django.utils.functional import cached_property from django.utils.functional import cached_property
from django.utils.module_loading import import_string from django.utils.module_loading import import_string
@ -28,6 +30,8 @@ class RedisSerializer:
class RedisCacheClient: class RedisCacheClient:
_pools = {}
def __init__( def __init__(
self, self,
servers, servers,
@ -40,7 +44,6 @@ class RedisCacheClient:
self._lib = redis self._lib = redis
self._servers = servers self._servers = servers
self._pools = {}
self._client = self._lib.Redis self._client = self._lib.Redis
@ -69,11 +72,16 @@ class RedisCacheClient:
def _get_connection_pool(self, write): def _get_connection_pool(self, write):
index = self._get_connection_pool_index(write) index = self._get_connection_pool_index(write)
if index not in self._pools: if index in self._pools:
self._pools[index] = self._pool_class.from_url( if self._pools[index].connection_kwargs == {
self._servers[index],
**self._pool_options, **self._pool_options,
) **parse_url(self._servers[index]),
}:
return self._pools[index]
self._pools[index] = self._pool_class.from_url(
self._servers[index],
**self._pool_options,
)
return self._pools[index] return self._pools[index]
def get_client(self, key=None, *, write=False): def get_client(self, key=None, *, write=False):

21
tests/cache/tests.py vendored
View File

@ -1870,6 +1870,27 @@ class RedisCacheTests(BaseCacheTests, TestCase):
self.assertEqual(pool.connection_kwargs["socket_timeout"], 0.1) self.assertEqual(pool.connection_kwargs["socket_timeout"], 0.1)
self.assertIs(pool.connection_kwargs["retry_on_timeout"], True) self.assertIs(pool.connection_kwargs["retry_on_timeout"], True)
def test_redis_common_pool(self):
pool1 = cache._cache._get_connection_pool(write=False)
pool2 = cache._cache._get_connection_pool(write=False)
self.assertEqual(id(pool1), id(pool2))
@override_settings(
CACHES=caches_setting_for_tests(
base=RedisCache_params,
exclude=redis_excluded_caches,
OPTIONS={
"db": 6,
"socket_timeout": 0.1,
"retry_on_timeout": True,
},
)
)
def get_connection_pool():
return cache._cache._get_connection_pool(write=False)
self.assertNotEqual(id(pool1), id(get_connection_pool()))
class FileBasedCachePathLibTests(FileBasedCacheTests): class FileBasedCachePathLibTests(FileBasedCacheTests):
def mkdtemp(self): def mkdtemp(self):