Skip to content

loadbalancer: make address assertion in LoadBalancerTest order-independent #3357

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

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

loadbalancer: make address assertion in LoadBalancerTest order-independent #3357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1192610
loadbalancer: make address assertion in LoadBalancerTest order-indepe…
lawrencewang49 Oct 28, 2025
22e5b20
Streaming gRPC client can leak responses if malformed response receiv…
idelpivnitskiy Oct 29, 2025
f5f1972
edit flaky assertions to pass even though selection isn't determinist…
lawrencewang49 Nov 3, 2025
a4d4717
Merge branch 'main' into fix-LingeringP2CLoadBalancerTest-resubscribe…
lawrencewang49 Nov 3, 2025
f3373a0
edit assertAddresses and assertConnectionCount to behave deterministi…
lawrencewang49 Nov 6, 2025
75592a6
remove unused imports
lawrencewang49 Nov 6, 2025
d615f15
Changed T to extend Map.Entry<String, ?> and wrapped roundRobining te…
lawrencewang49 Nov 6, 2025
ab728ae
removed unused import
lawrencewang49 Nov 6, 2025
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
36 changes: 18 additions & 18 deletions servicetalk-loadbalancer/src/test/java/io/servicetalk/loadbalancer/LoadBalancerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,24 +273,24 @@ private void testSelectStampede(final Predicate<TestLoadBalancedConnection> sele

@Test
void roundRobining() throws Exception {
assumeTrue(isRoundRobin());

sendServiceDiscoveryEvents(upEvent("address-1"));
sendServiceDiscoveryEvents(upEvent("address-2"));
final List<String> connections = awaitIndefinitely((lb.selectConnection(any(), null)
.concat(lb.selectConnection(any(), null))
.concat(lb.selectConnection(any(), null))
.concat(lb.selectConnection(any(), null))
.concat(lb.selectConnection(any(), null))
.map(TestLoadBalancedConnection::address)));

assertThat(connections, contains("address-1", "address-2", "address-1", "address-2", "address-1"));

assertConnectionCount(lb.usedAddresses(),
connectionsCount("address-1", 1),
connectionsCount("address-2", 1));

assertThat(connectionsCreated, hasSize(2));
if (isRoundRobin()) {
sendServiceDiscoveryEvents(upEvent("address-1"));
sendServiceDiscoveryEvents(upEvent("address-2"));
final List<String> connections = awaitIndefinitely((lb.selectConnection(any(), null)
.concat(lb.selectConnection(any(), null))
.concat(lb.selectConnection(any(), null))
.concat(lb.selectConnection(any(), null))
.concat(lb.selectConnection(any(), null))
.map(TestLoadBalancedConnection::address)));

assertThat(connections, contains("address-1", "address-2", "address-1", "address-2", "address-1"));

assertConnectionCount(lb.usedAddresses(),
connectionsCount("address-1", 1),
connectionsCount("address-2", 1));

assertThat(connectionsCreated, hasSize(2));
}
}

@Test
Expand Down
19 changes: 9 additions & 10 deletions ...talk-loadbalancer/src/test/java/io/servicetalk/loadbalancer/LoadBalancerTestScaffold.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

import java.util.AbstractMap;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
Expand All @@ -52,6 +53,7 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.both;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.hamcrest.Matchers.emptyIterable;
import static org.hamcrest.Matchers.hasProperty;
import static org.hamcrest.Matchers.hasSize;
Expand Down Expand Up @@ -169,19 +171,16 @@ static <T> void assertConnectionCount(
.collect(Collectors.toList())
.toArray(new Matcher[] {});
final Matcher<Iterable<? extends T>> iterableMatcher =
addressAndConnCount.length == 0 ? emptyIterable() : contains(args);
addressAndConnCount.length == 0 ? emptyIterable() : containsInAnyOrder(args);
assertThat(addresses, iterableMatcher);
}

<T> void assertAddresses(Iterable<T> addresses, String... address) {
@SuppressWarnings("unchecked")
final Matcher<? super T>[] args = (Matcher<? super T>[]) Arrays.stream(address)
.map(a -> hasProperty("key", is(a)))
.collect(Collectors.toList())
.toArray(new Matcher[] {});
final Matcher<Iterable<? extends T>> iterableMatcher =
address.length == 0 ? emptyIterable() : contains(args);
assertThat(addresses, iterableMatcher);
<T extends Map.Entry<String, ?>> void assertAddresses(Iterable<T> addresses, String... address) {
List<String> actualKeys = new ArrayList<>();
for (T item : addresses) {
actualKeys.add(item.getKey());
}
assertThat(actualKeys, containsInAnyOrder(address));
}

Map.Entry<String, Integer> connectionsCount(String addr, int count) {
Expand Down