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

http-netty: Re-enable ClientEfectivenessStrategyTest.clientStrategy #3105

Merged
merged 2 commits into from
Nov 14, 2024
Merged

http-netty: Re-enable ClientEfectivenessStrategyTest.clientStrategy #3105

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15b9d14
http-netty: Re-enable ClientEfectivenessStrategyTest.clientStrategy
bryce-anderson Nov 14, 2024
06af98e
more
bryce-anderson Nov 14, 2024
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: 32 additions & 4 deletions ...etalk-http-netty/src/test/java/io/servicetalk/http/netty/ClientEffectiveStrategyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,19 +56,21 @@
import org.hamcrest.Matchers;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.parallel.Execution;
import org.junit.jupiter.api.parallel.ExecutionMode;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.junit.platform.commons.logging.Logger;
import org.junit.platform.commons.logging.LoggerFactory;

import java.net.InetSocketAddress;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.EnumSet;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
import java.util.Queue;
Expand Down Expand Up @@ -102,6 +104,8 @@
@Execution(ExecutionMode.SAME_THREAD)
class ClientEffectiveStrategyTest {

private static final Logger LOGGER = LoggerFactory.getLogger(ClientEffectiveStrategyTest.class);

@RegisterExtension
static final ExecutionContextExtension SERVER_CTX =
ExecutionContextExtension.cached("server-io", "server-executor")
Expand Down Expand Up @@ -228,7 +232,6 @@ static Stream<Arguments> casesSupplier() {
return arguments.stream();
}

@Disabled // Disabled due to continued flakiness. See issue #2245 for more details.
@ParameterizedTest(name = "Type={0} builder={1} filter={2} LB={3} CF={4}")
@MethodSource("casesSupplier")
void clientStrategy(final BuilderType builderType,
Expand Down Expand Up @@ -330,7 +333,7 @@ public HttpExecutionStrategy requiredOffloads() {
invokingThreadsRecorder.reset(effectiveStrategy);
String responseBody = getResponse(clientApi, client, requestTarget);
assertThat("Unexpected response: " + responseBody, responseBody, is(not(emptyString())));
invokingThreadsRecorder.verifyOffloads(clientApi, client.executionContext().executionStrategy(),
invokingThreadsRecorder.flakyVerifyOffloads(clientApi, client.executionContext().executionStrategy(),
responseBody);

// Execute request one more time to make sure we cover all paths:
Expand All @@ -339,7 +342,7 @@ public HttpExecutionStrategy requiredOffloads() {
invokingThreadsRecorder.reset(effectiveStrategy);
responseBody = getResponse(clientApi, client, requestTarget);
assertThat("Unexpected response: " + responseBody, responseBody, is(not(emptyString())));
invokingThreadsRecorder.verifyOffloads(clientApi, client.executionContext().executionStrategy(),
invokingThreadsRecorder.flakyVerifyOffloads(clientApi, client.executionContext().executionStrategy(),
responseBody);
}
}
Expand Down Expand Up @@ -564,6 +567,31 @@ void recordThread(final ClientOffloadPoint offloadPoint, final HttpExecutionStra
});
}

void flakyVerifyOffloads(ClientApi clientApi, HttpExecutionStrategy clientStrategy, String apiStrategy) {
// For flaky tests we see unexpected offloading at the Send stage. This is messing with CI so this
// particular test case is skipped for now.
// See https://github.com/apple/servicetalk/issues/2245
Throwable firstFlakyException = null;
Iterator<Throwable> it = errors.iterator();
while (it.hasNext()) {
Throwable t = it.next();
// Example message:
// Suppressed: java.lang.AssertionError: Expected IoThread or ForkJoinPool-1-worker-1
// at Send, but was running on an offloading executor thread: client-executor-7-5.
// clientStrategy=DEFAULT_HTTP_EXECUTION_STRATEGY, expectedStrategy=OFFLOAD_NONE_STRATEGY,
// requestStrategy=DEFAULT_HTTP_EXECUTION_STRATEGY"
if (clientApi == ClientApi.BLOCKING_AGGREGATED && t.getMessage().contains(
"but was running on an offloading executor thread")) {
firstFlakyException = firstFlakyException == null ? t : firstFlakyException;
it.remove();
}
}
if (firstFlakyException != null) {
LOGGER.warn(firstFlakyException, () -> "Flaky throwable detected. Ignoring until test can be fixed.");
}
verifyOffloads(clientApi, clientStrategy, apiStrategy);
}

public void verifyOffloads(ClientApi clientApi, HttpExecutionStrategy clientStrategy, String apiStrategy) {
assertNoAsyncErrors("API=" + clientApi + ", apiStrategy=" + apiStrategy +
", clientStrategy=" + clientStrategy +
Expand Down
Loading