SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Subscribe on flux earlier. Fixes gh-802.

Browse Source
This commit is contained in:
Olga Maciaszek-Sharma
2020-08-11 13:05:07 +02:00
parent 0be2794631
commit 018aae3632
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/DiscoveryClientServiceInstanceListSupplier.java
View File

@@ -64,13 +64,14 @@ public class DiscoveryClientServiceInstanceListSupplier
resolveTimeout(environment);
this.serviceInstances = Flux
.defer(() -> Flux.just(delegate.getInstances(serviceId)))
.subscribeOn(Schedulers.boundedElastic())
.timeout(timeout, Flux.defer(() -> {
logTimeout();
return Flux.just(new ArrayList<>());
})).onErrorResume(error -> {
logException(error);
return Flux.just(new ArrayList<>());
}).subscribeOn(Schedulers.boundedElastic());
});
}
public DiscoveryClientServiceInstanceListSupplier(ReactiveDiscoveryClient delegate,

2
spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/core/DiscoveryClientServiceInstanceListSupplierTests.java
View File

@@ -20,7 +20,6 @@ import java.time.Duration;
import org.assertj.core.util.Lists;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.mockito.internal.stubbing.answers.AnswersWithDelay;
import org.mockito.internal.stubbing.answers.Returns;
@@ -173,7 +172,6 @@ class DiscoveryClientServiceInstanceListSupplierTests {
.verify(VERIFICATION_TIMEOUT);
}
@Disabled // see https://github.com/spring-cloud/spring-cloud-commons/issues/802
@Test
void shouldReturnEmptyInstancesListOnTimeoutBlockingClient() {
environment.setProperty(SERVICE_DISCOVERY_TIMEOUT, "100ms");