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

H2PriorKnowledgeFeatureParityTest.serverGracefulClose ConnectionAcceptor disable offloading #2444

Merged
merged 2 commits into from
Nov 24, 2022
Merged

H2PriorKnowledgeFeatureParityTest.serverGracefulClose ConnectionAcceptor disable offloading #2444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c712efe
H2PriorKnowledgeFeatureParityTest.serverGracefulClose ConnectionAccep…
Scottmitch Nov 23, 2022
bfeb54b
make operation lazy
Scottmitch Nov 24, 2022
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
23 changes: 19 additions & 4 deletions ...http-netty/src/test/java/io/servicetalk/http/netty/H2PriorKnowledgeFeatureParityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@
import io.servicetalk.http.api.StreamingHttpServiceFilterFactory;
import io.servicetalk.http.netty.NettyHttp2ExceptionUtils.H2StreamResetException;
import io.servicetalk.logging.api.LogLevel;
import io.servicetalk.transport.api.ConnectExecutionStrategy;
import io.servicetalk.transport.api.ConnectionAcceptor;
import io.servicetalk.transport.api.ConnectionAcceptorFactory;
import io.servicetalk.transport.api.ConnectionContext;
import io.servicetalk.transport.api.DelegatingConnectionAcceptor;
import io.servicetalk.transport.api.HostAndPort;
Expand Down Expand Up @@ -1843,11 +1846,23 @@ private InetSocketAddress bindHttpEchoServer(@Nullable StreamingHttpServiceFilte
}

if (connectionOnClosingLatch != null) {
serverBuilder.appendConnectionAcceptorFilter(original -> new DelegatingConnectionAcceptor(original) {
serverBuilder.appendConnectionAcceptorFilter(new ConnectionAcceptorFactory() {
@Override
public Completable accept(final ConnectionContext context) {
onGracefulClosureStarted(context, connectionOnClosingLatch);
return completed();
public ConnectionAcceptor create(final ConnectionAcceptor original) {
return new DelegatingConnectionAcceptor(original) {
@Override
public Completable accept(final ConnectionContext context) {
return Completable.defer(() -> {
onGracefulClosureStarted(context, connectionOnClosingLatch);
return completed().shareContextOnSubscribe();
});
}
};
}

@Override
public ConnectExecutionStrategy requiredOffloads() {
return ConnectExecutionStrategy.offloadNone();
}
});
}
Expand Down
31 changes: 26 additions & 5 deletions ...alk-http-netty/src/test/java/io/servicetalk/http/netty/NettyHttpServerConnectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,17 @@

import io.servicetalk.buffer.api.Buffer;
import io.servicetalk.concurrent.Cancellable;
import io.servicetalk.concurrent.api.Completable;
import io.servicetalk.concurrent.api.TestPublisher;
import io.servicetalk.concurrent.api.TestSubscription;
import io.servicetalk.http.api.HttpExecutionStrategy;
import io.servicetalk.http.api.StreamingHttpClient;
import io.servicetalk.http.api.StreamingHttpResponse;
import io.servicetalk.transport.api.ConnectExecutionStrategy;
import io.servicetalk.transport.api.ConnectionAcceptor;
import io.servicetalk.transport.api.ConnectionAcceptorFactory;
import io.servicetalk.transport.api.ConnectionContext;
import io.servicetalk.transport.api.DelegatingConnectionAcceptor;
import io.servicetalk.transport.api.ServerContext;
import io.servicetalk.transport.netty.internal.ExecutionContextExtension;
import io.servicetalk.transport.netty.internal.FlushStrategy;
Expand Down Expand Up @@ -89,11 +95,26 @@ void updateFlushStrategy(HttpExecutionStrategy serverExecutionStrategy,

serverContext = HttpServers.forAddress(localAddress(0))
.ioExecutor(contextRule.ioExecutor())
.appendConnectionAcceptorFilter(original -> original.append(ctx -> {
customCancellableRef.set(
((NettyConnectionContext) ctx).updateFlushStrategy((__, ___) -> customStrategy));
return completed();
}))
.appendConnectionAcceptorFilter(new ConnectionAcceptorFactory() {
@Override
public ConnectionAcceptor create(ConnectionAcceptor original) {
return new DelegatingConnectionAcceptor(original) {
@Override
public Completable accept(final ConnectionContext context) {
return Completable.defer(() -> {
customCancellableRef.set(((NettyConnectionContext) context)
.updateFlushStrategy((__, ___) -> customStrategy));
return completed().shareContextOnSubscribe();
});
}
};
}

@Override
public ConnectExecutionStrategy requiredOffloads() {
return ConnectExecutionStrategy.offloadNone();
}
})
.executionStrategy(serverExecutionStrategy)
.listenStreaming((ctx, request, responseFactory) -> {
if (handledFirstRequest.compareAndSet(false, true)) {
Expand Down