Skip to content
代码片段 群组 项目
未验证 提交 2afbd4f4 编辑于 作者: Sylvester Chin's avatar Sylvester Chin 提交者: GitLab
浏览文件

Update Redis recommended minimum version in requirements doc

This matches lib/system_check/app/redis_version_check.rb to avoid
confusion.
上级 c0643bca
No related branches found
No related tags found
无相关合并请求
...@@ -251,7 +251,7 @@ Redis stores all user sessions and the background task queue. ...@@ -251,7 +251,7 @@ Redis stores all user sessions and the background task queue.
The requirements for Redis are as follows: The requirements for Redis are as follows:
- Redis 6.x or 7.x is required in GitLab 16.0 and later. However, you should upgrade to - Redis 6.x or 7.x is required in GitLab 16.0 and later. However, you should upgrade to
Redis 6.2 or later as [Redis 6.0 is no longer supported](https://endoflife.date/redis). Redis 6.2.14 or later as [Redis 6.0 is no longer supported](https://endoflife.date/redis).
- Redis Cluster mode is not supported. Redis Standalone must be used, with or without HA. - Redis Cluster mode is not supported. Redis Standalone must be used, with or without HA.
- Storage requirements for Redis are minimal, about 25 kB per user on average. - Storage requirements for Redis are minimal, about 25 kB per user on average.
- [Redis eviction mode](../administration/redis/replication_and_failover_external.md#setting-the-eviction-policy) set appropriately. - [Redis eviction mode](../administration/redis/replication_and_failover_external.md#setting-the-eviction-policy) set appropriately.
......
...@@ -25,7 +25,7 @@ def check? ...@@ -25,7 +25,7 @@ def check?
@custom_error_message = "Your Redis version #{redis_version} is not supported anymore. Update your Redis server to a version >= #{RECOMMENDED_REDIS_VERSION}" @custom_error_message = "Your Redis version #{redis_version} is not supported anymore. Update your Redis server to a version >= #{RECOMMENDED_REDIS_VERSION}"
status = false status = false
elsif Gem::Version.new(redis_version) < Gem::Version.new(RECOMMENDED_REDIS_VERSION) elsif Gem::Version.new(redis_version) < Gem::Version.new(RECOMMENDED_REDIS_VERSION)
@custom_error_message = "Support for your Redis version #{redis_version} has been deprecated and will be removed soon. Update your Redis server to a version >= #{RECOMMENDED_REDIS_VERSION}" @custom_error_message = "Your Redis version #{redis_version} has reached end-of-life (EOL). Update your Redis server to a version >= #{RECOMMENDED_REDIS_VERSION}"
status = false status = false
end end
......
# frozen_string_literal: true
require 'spec_helper'
RSpec.describe SystemCheck::App::RedisVersionCheck, :silence_stdout, feature_category: :shared do
let(:checker) { described_class.new }
describe '#check?' do
using RSpec::Parameterized::TableSyntax
where(:info, :expected, :message) do
{ 'redis_version' => nil } | false |
"Could not retrieve the Redis version. Please check if your settings are correct"
{ 'redis_version' => '5.9.0' } | false |
("Your Redis version 5.9.0 is not supported anymore. " \
"Update your Redis server to a version >= #{described_class::RECOMMENDED_REDIS_VERSION}")
{ 'redis_version' => '6.0.0' } | false |
("Your Redis version 6.0.0 has reached end-of-life (EOL). " \
"Update your Redis server to a version >= #{described_class::RECOMMENDED_REDIS_VERSION}")
{ 'redis_version' => '6.2.14' } | true | nil
end
with_them do
it do
Gitlab::Redis::Queues.with do |redis|
allow(redis).to receive(:info).and_return(info)
end
expect(checker.check?).to eq(expected)
expect(checker.instance_variable_get(:@custom_error_message)).to eq(message)
end
end
end
end
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册