Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid configuring the database number in JedisClientConfiguration used for Sentinels.

Browse Source 
We now no longer configure the database number configured for data node access through JedisClientConfiguration instances that are used for Sentinel node connectivity. Previously, the configured database number lead to issuing a SELECT command on Sentinel that doesn't support database isolation.

Fixes: #2103.
Original Pull Request: #2112
This commit is contained in:
Mark Paluch
2021-07-02 11:49:18 +02:00
committed by Christoph Strobl
parent 1b6737e9a5
commit edde436f42
2 changed files with 48 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/org/springframework/data/redis/connection/jedis/JedisConnectionFactory.java
View File

@@ -319,7 +319,7 @@ public class JedisConnectionFactory implements InitializingBean, DisposableBean,
*/
public void afterPropertiesSet() {
clientConfig = createClientConfig(getRedisUsername(), getRedisPassword());
clientConfig = createClientConfig(getDatabase(), getRedisUsername(), getRedisPassword());
if (shardInfo == null && clientConfiguration instanceof MutableJedisClientConfiguration) {
@@ -360,7 +360,11 @@ public class JedisConnectionFactory implements InitializingBean, DisposableBean,
this.initialized = true;
}
private JedisClientConfig createClientConfig(@Nullable String username, RedisPassword password) {
private JedisClientConfig createSentinelClientConfig(SentinelConfiguration sentinelConfiguration) {
return createClientConfig(0, null, sentinelConfiguration.getSentinelPassword());
}
private JedisClientConfig createClientConfig(int database, @Nullable String username, RedisPassword password) {
DefaultJedisClientConfig.Builder builder = DefaultJedisClientConfig.builder();
@@ -368,7 +372,7 @@ public class JedisConnectionFactory implements InitializingBean, DisposableBean,
builder.connectionTimeoutMillis(getConnectTimeout());
builder.socketTimeoutMillis(getReadTimeout());
builder.database(getDatabase());
builder.database(database);
if (!ObjectUtils.isEmpty(username)) {
builder.user(username);
@@ -405,9 +409,8 @@ public class JedisConnectionFactory implements InitializingBean, DisposableBean,
protected Pool<Jedis> createRedisSentinelPool(RedisSentinelConfiguration config) {
GenericObjectPoolConfig<Jedis> poolConfig = getPoolConfig() != null ? getPoolConfig() : new JedisPoolConfig();
String sentinelUser = null;
JedisClientConfig sentinelConfig = createClientConfig(sentinelUser, config.getSentinelPassword());
JedisClientConfig sentinelConfig = createSentinelClientConfig(config);
return new JedisSentinelPool(config.getMaster().getName(), convertToJedisSentinelSet(config.getSentinels()),
poolConfig, this.clientConfig, sentinelConfig);
}
@@ -513,7 +516,7 @@ public class JedisConnectionFactory implements InitializingBean, DisposableBean,
SentinelConfiguration sentinelConfiguration = getSentinelConfiguration();
if (sentinelConfiguration != null) {
sentinelConfig = createClientConfig(null, sentinelConfiguration.getSentinelPassword());
sentinelConfig = createSentinelClientConfig(sentinelConfiguration);
}
JedisConnection connection = (getUsePool() ? new JedisConnection(jedis, pool, this.clientConfig, sentinelConfig)
@@ -904,7 +907,7 @@ public class JedisConnectionFactory implements InitializingBean, DisposableBean,
Assert.isTrue(RedisConfiguration.isSentinelConfiguration(configuration), "SentinelConfig must not be null!");
SentinelConfiguration sentinelConfiguration = (SentinelConfiguration) configuration;
JedisClientConfig clientConfig = createClientConfig(null, sentinelConfiguration.getSentinelPassword());
JedisClientConfig clientConfig = createSentinelClientConfig(sentinelConfiguration);
for (RedisNode node : sentinelConfiguration.getSentinels()) {
Jedis jedis = null;
@@ -929,6 +932,7 @@ public class JedisConnectionFactory implements InitializingBean, DisposableBean,
throw new InvalidDataAccessResourceUsageException("No Sentinel found");
}
private static Set<HostAndPort> convertToJedisSentinelSet(Collection<RedisNode> nodes) {
if (CollectionUtils.isEmpty(nodes)) {