openstack/zaqar
Code Issues Proposed changes

Merge "Change StrictRedis usage to Redis"

Browse Source
This commit is contained in:
Zuul 2023-08-21 18:54:14 +00:00 committed by Gerrit Code Review
commit 169d917c3e
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
releasenotes/notes/remove-strict-redis-e50cccbdf4a86f76.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
The minimum redis-py version required is now >= 3.0.0

4
zaqar/storage/redis/driver.py
View File

@ -318,14 +318,14 @@ def _get_redis_client(driver):
return sentinel.master_for(connection_uri.master) return sentinel.master_for(connection_uri.master)
elif connection_uri.strategy == STRATEGY_TCP: elif connection_uri.strategy == STRATEGY_TCP:
return redis.StrictRedis( return redis.Redis(
host=connection_uri.hostname, host=connection_uri.hostname,
port=connection_uri.port, port=connection_uri.port,
db=connection_uri.dbid, db=connection_uri.dbid,
password=connection_uri.password, password=connection_uri.password,
socket_timeout=connection_uri.socket_timeout) socket_timeout=connection_uri.socket_timeout)
else: else:
return redis.StrictRedis( return redis.Redis(
unix_socket_path=connection_uri.unix_socket_path, unix_socket_path=connection_uri.unix_socket_path,
db=connection_uri.dbid, db=connection_uri.dbid,
password=connection_uri.password, password=connection_uri.password,

4
zaqar/tests/unit/storage/test_impl_redis.py
View File

@ -179,13 +179,13 @@ class RedisDriverTest(testing.TestBase):
driver.ControlDriver driver.ControlDriver
(self.conf, cache)) (self.conf, cache))
self.assertIsInstance(redis_driver.connection, redis.StrictRedis) self.assertIsInstance(redis_driver.connection, redis.Redis)
def test_version_match(self): def test_version_match(self):
oslo_cache.register_config(self.conf) oslo_cache.register_config(self.conf)
cache = oslo_cache.get_cache(self.conf) cache = oslo_cache.get_cache(self.conf)
with mock.patch('redis.StrictRedis.info') as info: with mock.patch('redis.Redis.info') as info:
info.return_value = {'redis_version': '2.4.6'} info.return_value = {'redis_version': '2.4.6'}
self.assertRaises(RuntimeError, driver.DataDriver, self.assertRaises(RuntimeError, driver.DataDriver,
self.conf, cache, self.conf, cache,