Skip to content

Commit de85737

Browse files
ayudovinphilwebb
authored andcommitted
Drop blocking RedisReactiveHealthIndicator calls
Update `RedisReactiveHealthIndicator` so that `getReactiveConnection` is not called directly since it blocks. Fixed gh-16756
1 parent ed998ef commit de85737

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/redis/RedisReactiveHealthIndicator.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.util.Properties;
2020

2121
import reactor.core.publisher.Mono;
22+
import reactor.core.scheduler.Schedulers;
2223

2324
import org.springframework.boot.actuate.health.AbstractReactiveHealthIndicator;
2425
import org.springframework.boot.actuate.health.Health;
@@ -31,6 +32,7 @@
3132
*
3233
* @author Stephane Nicoll
3334
* @author Mark Paluch
35+
* @author Artsiom Yudovin
3436
* @since 2.0.0
3537
*/
3638
public class RedisReactiveHealthIndicator extends AbstractReactiveHealthIndicator {
@@ -44,10 +46,14 @@ public RedisReactiveHealthIndicator(
4446

4547
@Override
4648
protected Mono<Health> doHealthCheck(Health.Builder builder) {
47-
ReactiveRedisConnection connection = this.connectionFactory
48-
.getReactiveConnection();
49-
return connection.serverCommands().info().map((info) -> up(builder, info))
50-
.doFinally((signal) -> connection.close());
49+
Mono<ReactiveRedisConnection> connection = Mono
50+
.fromSupplier(this.connectionFactory::getReactiveConnection)
51+
.subscribeOn(Schedulers.parallel());
52+
53+
return connection
54+
.flatMap((c) -> c.serverCommands().info().map((info) -> up(builder, info))
55+
.onErrorResume((e) -> Mono.just(builder.down(e).build()))
56+
.flatMap((signal) -> c.closeLater().thenReturn(signal)));
5157
}
5258

5359
private Health up(Health.Builder builder, Properties info) {

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/redis/RedisReactiveHealthIndicatorTests.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
* @author Stephane Nicoll
4242
* @author Mark Paluch
4343
* @author Nikolay Rybak
44+
* @author Artsiom Yudovin
4445
*/
4546
public class RedisReactiveHealthIndicatorTests {
4647

@@ -49,6 +50,7 @@ public void redisIsUp() {
4950
Properties info = new Properties();
5051
info.put("redis_version", "2.8.9");
5152
ReactiveRedisConnection redisConnection = mock(ReactiveRedisConnection.class);
53+
given(redisConnection.closeLater()).willReturn(Mono.empty());
5254
ReactiveServerCommands commands = mock(ReactiveServerCommands.class);
5355
given(commands.info()).willReturn(Mono.just(info));
5456
RedisReactiveHealthIndicator healthIndicator = createHealthIndicator(
@@ -59,7 +61,7 @@ public void redisIsUp() {
5961
assertThat(h.getDetails()).containsOnlyKeys("version");
6062
assertThat(h.getDetails().get("version")).isEqualTo("2.8.9");
6163
}).verifyComplete();
62-
verify(redisConnection).close();
64+
verify(redisConnection).closeLater();
6365
}
6466

6567
@Test
@@ -68,13 +70,14 @@ public void redisCommandIsDown() {
6870
given(commands.info()).willReturn(
6971
Mono.error(new RedisConnectionFailureException("Connection failed")));
7072
ReactiveRedisConnection redisConnection = mock(ReactiveRedisConnection.class);
73+
given(redisConnection.closeLater()).willReturn(Mono.empty());
7174
RedisReactiveHealthIndicator healthIndicator = createHealthIndicator(
7275
redisConnection, commands);
7376
Mono<Health> health = healthIndicator.health();
7477
StepVerifier.create(health)
7578
.consumeNextWith((h) -> assertThat(h.getStatus()).isEqualTo(Status.DOWN))
7679
.verifyComplete();
77-
verify(redisConnection).close();
80+
verify(redisConnection).closeLater();
7881
}
7982

8083
@Test

0 commit comments

Comments
 (0)