Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RedisReactiveHealthIndicator makes blocking call on error #16756

Closed
wants to merge 3 commits into from
Closed

RedisReactiveHealthIndicator makes blocking call on error #16756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67646d0
replacing close() to closeLater()
ayudovin May 8, 2019
5b8d89f
adding parallel
ayudovin May 9, 2019
c1cf458
removing lazy evaluation of closeLater()
ayudovin May 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions ...or/src/main/java/org/springframework/boot/actuate/redis/RedisReactiveHealthIndicator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.util.Properties;

import reactor.core.publisher.Mono;
import reactor.core.scheduler.Schedulers;

import org.springframework.boot.actuate.health.AbstractReactiveHealthIndicator;
import org.springframework.boot.actuate.health.Health;
Expand All @@ -31,6 +32,7 @@
*
* @author Stephane Nicoll
* @author Mark Paluch
* @author Artsiom Yudovin
* @since 2.0.0
*/
public class RedisReactiveHealthIndicator extends AbstractReactiveHealthIndicator {
Expand All @@ -44,10 +46,14 @@ public RedisReactiveHealthIndicator(

@Override
protected Mono<Health> doHealthCheck(Health.Builder builder) {
ReactiveRedisConnection connection = this.connectionFactory
.getReactiveConnection();
return connection.serverCommands().info().map((info) -> up(builder, info))
.doFinally((signal) -> connection.close());
Mono<ReactiveRedisConnection> connection = Mono
.fromSupplier(this.connectionFactory::getReactiveConnection)
.subscribeOn(Schedulers.parallel());

return connection
.flatMap((c) -> c.serverCommands().info().map((info) -> up(builder, info))
.onErrorResume((e) -> Mono.just(builder.down(e).build()))
.flatMap((signal) -> c.closeLater().thenReturn(signal)));
}

private Health up(Health.Builder builder, Properties info) {
Expand Down
7 changes: 5 additions & 2 deletions ...c/test/java/org/springframework/boot/actuate/redis/RedisReactiveHealthIndicatorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
* @author Stephane Nicoll
* @author Mark Paluch
* @author Nikolay Rybak
* @author Artsiom Yudovin
*/
public class RedisReactiveHealthIndicatorTests {

Expand All @@ -49,6 +50,7 @@ public void redisIsUp() {
Properties info = new Properties();
info.put("redis_version", "2.8.9");
ReactiveRedisConnection redisConnection = mock(ReactiveRedisConnection.class);
given(redisConnection.closeLater()).willReturn(Mono.empty());
ReactiveServerCommands commands = mock(ReactiveServerCommands.class);
given(commands.info()).willReturn(Mono.just(info));
RedisReactiveHealthIndicator healthIndicator = createHealthIndicator(
Expand All @@ -59,7 +61,7 @@ public void redisIsUp() {
assertThat(h.getDetails()).containsOnlyKeys("version");
assertThat(h.getDetails().get("version")).isEqualTo("2.8.9");
}).verifyComplete();
verify(redisConnection).close();
verify(redisConnection).closeLater();
}

@Test
Expand All @@ -68,13 +70,14 @@ public void redisCommandIsDown() {
given(commands.info()).willReturn(
Mono.error(new RedisConnectionFailureException("Connection failed")));
ReactiveRedisConnection redisConnection = mock(ReactiveRedisConnection.class);
given(redisConnection.closeLater()).willReturn(Mono.empty());
RedisReactiveHealthIndicator healthIndicator = createHealthIndicator(
redisConnection, commands);
Mono<Health> health = healthIndicator.health();
StepVerifier.create(health)
.consumeNextWith((h) -> assertThat(h.getStatus()).isEqualTo(Status.DOWN))
.verifyComplete();
verify(redisConnection).close();
verify(redisConnection).closeLater();
}

@Test
Expand Down