Skip to content

ensures LoadbalancedRSocket select new rsocket upon re-subscription RC #1086

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.

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

Merged
merged 2 commits into from
Apr 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion rsocket-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ dependencies {
testImplementation 'org.assertj:assertj-core'
testImplementation 'org.junit.jupiter:junit-jupiter-api'
testImplementation 'org.junit.jupiter:junit-jupiter-params'
testImplementation 'org.mockito:mockito-core'
testImplementation 'org.mockito:mockito-junit-jupiter'
testImplementation 'org.awaitility:awaitility'

testRuntimeOnly 'ch.qos.logback:logback-classic'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
import reactor.util.annotation.Nullable;

/**
* An implementation of {@link RSocketClient backed by a pool of {@code RSocket} instances and using a {@link
* LoadbalanceStrategy} to select the {@code RSocket} to use for a given request.
* An implementation of {@link RSocketClient} backed by a pool of {@code RSocket} instances and
* using a {@link LoadbalanceStrategy} to select the {@code RSocket} to use for a given request.
*
* @since 1.1
*/
Expand Down Expand Up @@ -73,7 +73,7 @@ public Flux<Payload> requestStream(Mono<Payload> payloadMono) {

@Override
public Flux<Payload> requestChannel(Publisher<Payload> payloads) {
return rSocketPool.select().requestChannel(payloads);
return source().flatMapMany(rSocket -> rSocket.requestChannel(payloads));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
package io.rsocket.loadbalance;

import static java.util.Collections.singletonList;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;

import io.rsocket.Payload;
import io.rsocket.RSocket;
import io.rsocket.core.RSocketClient;
import io.rsocket.core.RSocketConnector;
import io.rsocket.transport.ClientTransport;
import io.rsocket.util.DefaultPayload;
import java.time.Duration;
import java.util.concurrent.atomic.AtomicInteger;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.reactivestreams.Publisher;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;

@ExtendWith(MockitoExtension.class)
class LoadbalanceRSocketClientTest {

@Mock private ClientTransport clientTransport;
@Mock private RSocketConnector rSocketConnector;

public static final Duration SHORT_DURATION = Duration.ofMillis(25);
public static final Duration LONG_DURATION = Duration.ofMillis(75);

private static final Publisher<Payload> SOURCE =
Flux.interval(SHORT_DURATION).map(String::valueOf).map(DefaultPayload::create);

private static final Mono<RSocket> PROGRESSING_HANDLER =
Mono.just(
new RSocket() {
private final AtomicInteger i = new AtomicInteger();

@Override
public Flux<Payload> requestChannel(Publisher<Payload> payloads) {
return Flux.from(payloads)
.delayElements(SHORT_DURATION)
.map(Payload::getDataUtf8)
.map(DefaultPayload::create)
.take(i.incrementAndGet());
}
});

@Test
void testChannelReconnection() {
when(rSocketConnector.connect(clientTransport)).thenReturn(PROGRESSING_HANDLER);

RSocketClient client =
LoadbalanceRSocketClient.create(
rSocketConnector,
Mono.just(singletonList(LoadbalanceTarget.from("key", clientTransport))));

Publisher<String> result =
client
.requestChannel(SOURCE)
.repeatWhen(longFlux -> longFlux.delayElements(LONG_DURATION).take(5))
.map(Payload::getDataUtf8)
.log();

StepVerifier.create(result)
.expectSubscription()
.assertNext(s -> assertThat(s).isEqualTo("0"))
.assertNext(s -> assertThat(s).isEqualTo("0"))
.assertNext(s -> assertThat(s).isEqualTo("1"))
.assertNext(s -> assertThat(s).isEqualTo("0"))
.assertNext(s -> assertThat(s).isEqualTo("1"))
.assertNext(s -> assertThat(s).isEqualTo("2"))
.assertNext(s -> assertThat(s).isEqualTo("0"))
.assertNext(s -> assertThat(s).isEqualTo("1"))
.assertNext(s -> assertThat(s).isEqualTo("2"))
.assertNext(s -> assertThat(s).isEqualTo("3"))
.assertNext(s -> assertThat(s).isEqualTo("0"))
.assertNext(s -> assertThat(s).isEqualTo("1"))
.assertNext(s -> assertThat(s).isEqualTo("2"))
.assertNext(s -> assertThat(s).isEqualTo("3"))
.assertNext(s -> assertThat(s).isEqualTo("4"))
.verifyComplete();

verify(rSocketConnector).connect(clientTransport);
verifyNoMoreInteractions(rSocketConnector, clientTransport);
}
}