Skip to content

DefaultManagedHttpClientConnection: Restore original socket timeout #785

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
rschmitt wants to merge 1 commit into
base: master
Choose a base branch
from
+32 −32
Open

DefaultManagedHttpClientConnection: Restore original socket timeout #785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 14 additions & 18 deletions ...nt5-testing/src/test/java/org/apache/hc/client5/testing/async/TestAsyncSocketTimeout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
import org.apache.hc.core5.http.Method;
import org.apache.hc.core5.http.URIScheme;
import org.apache.hc.core5.io.CloseMode;
import org.apache.hc.core5.util.VersionInfo;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Timeout;
import org.junit.jupiter.params.ParameterizedTest;
Expand All @@ -51,7 +50,6 @@
import static org.apache.hc.core5.util.ReflectionUtils.determineJRELevel;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assumptions.assumeFalse;
import static org.junit.jupiter.api.Assumptions.assumeTrue;

abstract class AbstractTestSocketTimeout extends AbstractIntegrationTestBase {
Expand Down Expand Up @@ -83,21 +81,26 @@ void testReadTimeouts(final int connConfigTimeout, final int responseTimeout) th
}

for (final boolean drip : new boolean[]{ false, true }) {
final SimpleHttpRequest request = getRequest(responseTimeout, drip,
target);

final Throwable cause = assertThrows(ExecutionException.class, () -> client.execute(request, null).get())
.getCause();
assertInstanceOf(SocketTimeoutException.class, cause);
for (final boolean reuseConnection : new boolean[]{ false, true }) {
if (reuseConnection) {
client.execute(getRequest(2500, 0, false, target), null).get();
}
final SimpleHttpRequest request = getRequest(responseTimeout, 2500, drip, target);

final Throwable cause = assertThrows(ExecutionException.class,
() -> client.execute(request, null).get()).getCause();
assertInstanceOf(SocketTimeoutException.class, cause,
String.format("drip=%s, reuseConnection=%s", drip, reuseConnection));
}
}

closeClient(client);
}

private SimpleHttpRequest getRequest(final int responseTimeout, final boolean drip, final HttpHost target)
throws Exception {
private SimpleHttpRequest getRequest(final int responseTimeout, final int delay, final boolean drip,
final HttpHost target) throws Exception {
final SimpleHttpRequest request = SimpleHttpRequest.create(Method.GET, target,
"/random/10240?delay=2500&drip=" + (drip ? 1 : 0));
"/random/10240?delay=" + delay + "&drip=" + (drip ? 1 : 0));
if (responseTimeout > 0) {
request.setConfig(RequestConfig.custom()
.setUnixDomainSocket(getUnixDomainSocket())
Expand Down Expand Up @@ -138,13 +141,6 @@ public Uds() {
@Override
void checkAssumptions() {
assumeTrue(determineJRELevel() >= 16, "Async UDS requires Java 16+");
final String[] components = VersionInfo
.loadVersionInfo("org.apache.hc.core5", getClass().getClassLoader())
.getRelease()
.split("[-.]");
final int majorVersion = Integer.parseInt(components[0]);
final int minorVersion = Integer.parseInt(components[1]);
assumeFalse(majorVersion <= 5 && minorVersion <= 3, "Async UDS requires HttpCore 5.4+");
}
}
}
Expand Down
16 changes: 11 additions & 5 deletions httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestSocketTimeout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,21 @@ void testReadTimeouts(final int socketConfigTimeout, final int connConfigTimeout
}

for (final boolean drip : new boolean[]{ false, true }) {
final HttpGet request = getRequest(responseTimeout, drip);
for (final boolean reuseConnection : new boolean[]{ false, true }) {
if (reuseConnection) {
client.execute(target, getRequest(5000, 0, false), new BasicHttpClientResponseHandler());
}
final HttpGet request = getRequest(responseTimeout, 2500, drip);

assertThrows(SocketTimeoutException.class, () ->
client.execute(target, request, new BasicHttpClientResponseHandler()));
assertThrows(SocketTimeoutException.class, () ->
client.execute(target, request, new BasicHttpClientResponseHandler()),
String.format("drip=%s, reuseConnection=%s", drip, reuseConnection));
}
}
}

private HttpGet getRequest(final int responseTimeout, final boolean drip) throws Exception {
final HttpGet request = new HttpGet(new URI("/random/10240?delay=2500&drip=" + (drip ? 1 : 0)));
private HttpGet getRequest(final int responseTimeout, final int delay, final boolean drip) throws Exception {
final HttpGet request = new HttpGet(new URI("/random/10240?delay=" + delay + "&drip=" + (drip ? 1 : 0)));
if (responseTimeout > 0) {
request.setConfig(RequestConfig.custom()
.setUnixDomainSocket(getUnixDomainSocket())
Expand Down
5 changes: 2 additions & 3 deletions ...src/main/java/org/apache/hc/client5/http/impl/io/DefaultHttpClientConnectionOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,8 @@ private void upgradeToTls(final ManagedHttpClientConnection conn, final HttpHost
socket.setSoTimeout(handshakeTimeout.toMillisecondsIntBound());
}
final SSLSocket sslSocket = tlsSocketStrategy.upgrade(socket, tlsName.getHostName(), tlsName.getPort(), attachment, context);
conn.bind(sslSocket, socket);
socket.setSoTimeout(soTimeout);
conn.bind(sslSocket, socket);
onAfterTlsHandshake(context, endpointHost);
if (LOG.isDebugEnabled()) {
LOG.debug("{} {} upgraded to TLS", ConnPoolSupport.getId(conn), tlsName);
Expand All @@ -283,11 +283,10 @@ private void connectToUnixDomainSocket(
}
final Socket newSocket = unixDomainSocketFactory.createSocket();
try {
conn.bind(newSocket);
final Socket socket = unixDomainSocketFactory.connectSocket(newSocket, unixDomainSocket,
connectTimeout);
conn.bind(socket);
configureSocket(socket, socketConfig, false);
conn.bind(socket);
onAfterSocketConnect(context, endpointHost);
if (LOG.isDebugEnabled()) {
LOG.debug("{} {} connected to {}", ConnPoolSupport.getId(conn), endpointHost, unixDomainSocket);
Expand Down
11 changes: 5 additions & 6 deletions .../src/main/java/org/apache/hc/client5/http/impl/io/DefaultManagedHttpClientConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public class DefaultManagedHttpClientConnection
private final String id;
private final AtomicBoolean closed;

private Timeout socketTimeout;
private Timeout origSocketTimeout;

public DefaultManagedHttpClientConnection(
final String id,
Expand Down Expand Up @@ -132,7 +132,7 @@ public void bind(final SocketHolder socketHolder) throws IOException {
throw new InterruptedIOException("Connection already shutdown");
}
super.bind(socketHolder);
socketTimeout = Timeout.ofMilliseconds(socketHolder.getSocket().getSoTimeout());
origSocketTimeout = Timeout.ofMilliseconds(socketHolder.getSocket().getSoTimeout());
}

@Override
Expand Down Expand Up @@ -166,7 +166,6 @@ public void setSocketTimeout(final Timeout timeout) {
LOG.debug("{} set socket timeout to {}", this.id, timeout);
}
super.setSocketTimeout(timeout);
socketTimeout = timeout;
}

@Override
Expand All @@ -182,15 +181,15 @@ public void close(final CloseMode closeMode) {
@Override
public void bind(final Socket socket) throws IOException {
super.bind(WIRE_LOG.isDebugEnabled() ? new LoggingSocketHolder(socket, this.id, WIRE_LOG) : new SocketHolder(socket));
socketTimeout = Timeout.ofMilliseconds(socket.getSoTimeout());
origSocketTimeout = Timeout.ofMilliseconds(socket.getSoTimeout());
}

@Override
public void bind(final SSLSocket sslSocket, final Socket socket) throws IOException {
super.bind(WIRE_LOG.isDebugEnabled() ?
new LoggingSocketHolder(sslSocket, socket, this.id, WIRE_LOG) :
new SocketHolder(sslSocket, socket));
socketTimeout = Timeout.ofMilliseconds(sslSocket.getSoTimeout());
origSocketTimeout = Timeout.ofMilliseconds(sslSocket.getSoTimeout());
}

@Override
Expand Down Expand Up @@ -222,7 +221,7 @@ public void passivate() {

@Override
public void activate() {
super.setSocketTimeout(socketTimeout);
super.setSocketTimeout(origSocketTimeout);
}

}