Default Lettuce shutdownQuietPeriod to zero.

Use a lower timeout for faster shutdown. Also, the quiet period is no longer configured through the shutdown timeout. Closes #2945
spring-projects · Aug 8, 2024 · 96e4692 · 96e4692
1 parent fbf94b1
commit 96e4692
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/.../org/springframework/data/redis/connection/lettuce/DefaultLettuceClientConfiguration.java b/.../org/springframework/data/redis/connection/lettuce/DefaultLettuceClientConfiguration.java
@@ -49,7 +49,7 @@ class DefaultLettuceClientConfiguration implements LettuceClientConfiguration {
 	DefaultLettuceClientConfiguration(boolean useSsl, boolean verifyPeer, boolean startTls,
 			@Nullable ClientResources clientResources, @Nullable ClientOptions clientOptions, @Nullable String clientName,
 			@Nullable ReadFrom readFrom, @Nullable RedisCredentialsProviderFactory redisCredentialsProviderFactory,
-			Duration timeout, Duration shutdownTimeout, @Nullable Duration shutdownQuietPeriod) {
+			Duration timeout, Duration shutdownTimeout, Duration shutdownQuietPeriod) {
 
 		this.useSsl = useSsl;
 		this.verifyPeer = verifyPeer;
@@ -61,7 +61,7 @@ class DefaultLettuceClientConfiguration implements LettuceClientConfiguration {
 		this.redisCredentialsProviderFactory = Optional.ofNullable(redisCredentialsProviderFactory);
 		this.timeout = timeout;
 		this.shutdownTimeout = shutdownTimeout;
-		this.shutdownQuietPeriod = shutdownQuietPeriod != null ? shutdownQuietPeriod : shutdownTimeout;
+		this.shutdownQuietPeriod = shutdownQuietPeriod;
 	}
 
 	@Override

diff --git a/...in/java/org/springframework/data/redis/connection/lettuce/LettuceClientConfiguration.java b/...in/java/org/springframework/data/redis/connection/lettuce/LettuceClientConfiguration.java
@@ -175,7 +175,7 @@ class LettuceClientConfigurationBuilder {
 		@Nullable RedisCredentialsProviderFactory redisCredentialsProviderFactory;
 		Duration timeout = Duration.ofSeconds(RedisURI.DEFAULT_TIMEOUT);
 		Duration shutdownTimeout = Duration.ofMillis(100);
-		@Nullable Duration shutdownQuietPeriod;
+		Duration shutdownQuietPeriod = Duration.ZERO;
 
 		LettuceClientConfigurationBuilder() {}
 

diff --git a/...rg/springframework/data/redis/connection/lettuce/LettuceClientConfigurationUnitTests.java b/...rg/springframework/data/redis/connection/lettuce/LettuceClientConfigurationUnitTests.java
@@ -37,12 +37,11 @@
  */
 class LettuceClientConfigurationUnitTests {
 
-	@Test // DATAREDIS-574, DATAREDIS-576, DATAREDIS-667, DATAREDIS-918
+	@Test // DATAREDIS-574, DATAREDIS-576, DATAREDIS-667, DATAREDIS-918, GH-2945
 	void shouldCreateEmptyConfiguration() {
 
 		LettuceClientConfiguration configuration = LettuceClientConfiguration.defaultConfiguration();
 
-
 		assertThat(configuration.isUseSsl()).isFalse();
 		assertThat(configuration.isVerifyPeer()).isTrue();
 		assertThat(configuration.isStartTls()).isFalse();
@@ -55,7 +54,7 @@ void shouldCreateEmptyConfiguration() {
 		assertThat(configuration.getClientName()).isEmpty();
 		assertThat(configuration.getCommandTimeout()).isEqualTo(Duration.ofSeconds(60));
 		assertThat(configuration.getShutdownTimeout()).isEqualTo(Duration.ofMillis(100));
-		assertThat(configuration.getShutdownQuietPeriod()).isEqualTo(Duration.ofMillis(100));
+		assertThat(configuration.getShutdownQuietPeriod()).isEqualTo(Duration.ZERO);
 	}
 
 	@Test // DATAREDIS-574, DATAREDIS-576, DATAREDIS-667
@@ -88,13 +87,13 @@ void shouldConfigureAllProperties() {
 	}
 
 	@Test // DATAREDIS-881
-	void shutdownQuietPeriodShouldDefaultToTimeout() {
+	void shutdownQuietPeriodShouldDefaultInitialValue() {
 
 		LettuceClientConfiguration configuration = LettuceClientConfiguration.builder()
 				.shutdownTimeout(Duration.ofSeconds(42)).build();
 
 		assertThat(configuration.getShutdownTimeout()).isEqualTo(Duration.ofSeconds(42));
-		assertThat(configuration.getShutdownQuietPeriod()).isEqualTo(Duration.ofSeconds(42));
+		assertThat(configuration.getShutdownQuietPeriod()).isEqualTo(Duration.ZERO);
 	}
 
 	@Test // DATAREDIS-576

diff --git a/...ngframework/data/redis/connection/lettuce/LettucePoolingClientConfigurationUnitTests.java b/...ngframework/data/redis/connection/lettuce/LettucePoolingClientConfigurationUnitTests.java
@@ -38,7 +38,7 @@
  */
 class LettucePoolingClientConfigurationUnitTests {
 
-	@Test // DATAREDIS-667, DATAREDIS-918
+	@Test // DATAREDIS-667, DATAREDIS-918, GH-2945
 	void shouldCreateEmptyConfiguration() {
 
 		LettucePoolingClientConfiguration configuration = LettucePoolingClientConfiguration.defaultConfiguration();
@@ -55,7 +55,7 @@ void shouldCreateEmptyConfiguration() {
 		assertThat(configuration.getClientResources()).isEmpty();
 		assertThat(configuration.getCommandTimeout()).isEqualTo(Duration.ofSeconds(60));
 		assertThat(configuration.getShutdownTimeout()).isEqualTo(Duration.ofMillis(100));
-		assertThat(configuration.getShutdownQuietPeriod()).isEqualTo(Duration.ofMillis(100));
+		assertThat(configuration.getShutdownQuietPeriod()).isEqualTo(Duration.ZERO);
 	}
 
 	@Test // DATAREDIS-667