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

Avoid cast to StatefulRedisConnection upon eager LettuceConnectionFactory initialization.

Browse Source 
We now no longer try to cast the Lettuce connection to StatefulRedisConnection when eagerly initializing the shared connection. Instead, we now introduced another method to obtain the cluster connection.

Closes #2186
This commit is contained in:
Mark Paluch
2021-11-12 08:51:41 +01:00
parent b2f7b6f4b2
commit 518fd6d946
2 changed files with 68 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionFactoryTests.java
View File

@@ -48,6 +48,7 @@ import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
import org.springframework.data.redis.connection.RedisStaticMasterReplicaConfiguration;
import org.springframework.data.redis.connection.StringRedisConnection;
import org.springframework.data.redis.connection.lettuce.extension.LettuceConnectionFactoryExtension;
import org.springframework.data.redis.test.condition.EnabledOnRedisClusterAvailable;
import org.springframework.data.redis.test.extension.LettuceTestClientResources;
/**
@@ -85,7 +86,6 @@ class LettuceConnectionFactoryTests {
factory.destroy();
}
@SuppressWarnings("rawtypes")
@Test
void testGetNewConnectionOnError() throws Exception {
@@ -462,9 +462,8 @@ class LettuceConnectionFactoryTests {
RedisConnection connection = factory.getConnection();
assertThatThrownBy(() -> connection.pSubscribe((message, pattern) -> {
}, "foo".getBytes())).isInstanceOf(RedisConnectionFailureException.class)
.hasCauseInstanceOf(UnsupportedOperationException.class);
assertThatThrownBy(() -> connection.pSubscribe((message, pattern) -> {}, "foo".getBytes()))
.isInstanceOf(RedisConnectionFailureException.class).hasCauseInstanceOf(UnsupportedOperationException.class);
connection.close();
factory.destroy();
@@ -558,4 +557,44 @@ class LettuceConnectionFactoryTests {
connection.close();
}
@Test // GH-2186
void shouldInitializeMasterReplicaConnectionsEagerly() {
LettuceClientConfiguration configuration = LettuceClientConfiguration.builder()
.clientResources(LettuceTestClientResources.getSharedClientResources()).build();
RedisStaticMasterReplicaConfiguration elastiCache = new RedisStaticMasterReplicaConfiguration(
SettingsUtils.getHost()).node(SettingsUtils.getHost(), SettingsUtils.getPort() + 1);
LettuceConnectionFactory factory = new LettuceConnectionFactory(elastiCache, configuration);
factory.setEagerInitialization(true);
factory.afterPropertiesSet();
assertThat(factory.getSharedConnection()).isNotNull();
assertThat(factory.getSharedClusterConnection()).isNull();
factory.getConnection().close();
factory.destroy();
}
@Test // GH-2186
@EnabledOnRedisClusterAvailable
void shouldInitializeClusterConnectionsEagerly() {
LettuceClientConfiguration configuration = LettuceClientConfiguration.builder()
.clientResources(LettuceTestClientResources.getSharedClientResources()).build();
LettuceConnectionFactory factory = new LettuceConnectionFactory(SettingsUtils.clusterConfiguration(),
configuration);
factory.setEagerInitialization(true);
factory.afterPropertiesSet();
assertThat(factory.getSharedConnection()).isNull();
assertThat(factory.getSharedClusterConnection()).isNotNull();
factory.getConnection().close();
factory.destroy();
}
}