Skip to content

Commit

Permalink
Rewrite the pool implementation
Browse files Browse the repository at this point in the history
  • Loading branch information
@vietj
vietj committed Nov 13, 2017
1 parent 27bb6e4 commit a57fb6b
Show file tree
Hide file tree
Showing 15 changed files with 1,147 additions and 593 deletions.
6 changes: 3 additions & 3 deletions src/main/java/io/vertx/core/http/impl/Http1xClientConnection.java
View file
Expand Up @@ -460,7 +460,7 @@ public void reset(long code) {
private void requestEnded() { private void requestEnded() {
context.runOnContext(v -> { context.runOnContext(v -> {
if (pipelining && requests.size() < pipeliningLimit) { if (pipelining && requests.size() < pipeliningLimit) {
listener.recycle(this); listener.onRecycle(this);
} }
}); });
} }
Expand All @@ -471,7 +471,7 @@ private void responseEnded() {
} else { } else {
context.runOnContext(v -> { context.runOnContext(v -> {
if (currentRequest == null) { if (currentRequest == null) {
listener.recycle(this); listener.onRecycle(this);
} }
}); });
} }
Expand Down Expand Up @@ -630,7 +630,7 @@ protected void handleMessage(NetSocketImpl connection, ContextImpl context, Chan
ByteBuf buf = (ByteBuf) msg; ByteBuf buf = (ByteBuf) msg;
connection.handleMessageReceived(buf); connection.handleMessageReceived(buf);
} }
}.removeHandler(sock -> listener.closed(this))); }.removeHandler(sock -> listener.onClose(this)));
return socket; return socket;
} }


Expand Down
7 changes: 3 additions & 4 deletions src/main/java/io/vertx/core/http/impl/Http2ClientConnection.java
View file
Expand Up @@ -49,7 +49,6 @@ class Http2ClientConnection extends Http2ConnectionBase implements HttpClientCon
private final HttpClientImpl client; private final HttpClientImpl client;
final HttpClientMetrics metrics; final HttpClientMetrics metrics;
final Object queueMetric; final Object queueMetric;
int streamCount; // Exclusively used by the HTTP/2 connection pool


public Http2ClientConnection(ConnectionListener<HttpClientConnection> listener, public Http2ClientConnection(ConnectionListener<HttpClientConnection> listener,
Object queueMetric, Object queueMetric,
Expand All @@ -70,8 +69,8 @@ public Channel channel() {
} }


@Override @Override
protected void concurrencyChanged() { protected void concurrencyChanged(long concurrency) {
listener.concurrencyChanged(this); listener.onConcurrencyChange(this, concurrency);
} }


@Override @Override
Expand All @@ -82,7 +81,7 @@ public HttpClientMetrics metrics() {
@Override @Override
void onStreamClosed(Http2Stream nettyStream) { void onStreamClosed(Http2Stream nettyStream) {
super.onStreamClosed(nettyStream); super.onStreamClosed(nettyStream);
listener.recycle(this); listener.onRecycle(this);
} }


public synchronized HttpClientStream createStream() throws Http2Exception { public synchronized HttpClientStream createStream() throws Http2Exception {
Expand Down
20 changes: 13 additions & 7 deletions src/main/java/io/vertx/core/http/impl/Http2ConnectionBase.java
View file
Expand Up @@ -84,7 +84,7 @@ static ByteBuf safeBuffer(ByteBuf buf, ByteBufAllocator allocator) {
private final ArrayDeque<Runnable> updateSettingsHandlers = new ArrayDeque<>(4); private final ArrayDeque<Runnable> updateSettingsHandlers = new ArrayDeque<>(4);
private final ArrayDeque<Handler<AsyncResult<Buffer>>> pongHandlers = new ArrayDeque<>(); private final ArrayDeque<Handler<AsyncResult<Buffer>>> pongHandlers = new ArrayDeque<>();
private Http2Settings localSettings = new Http2Settings(); private Http2Settings localSettings = new Http2Settings();
private Http2Settings remoteSettings = new Http2Settings(); private Http2Settings remoteSettings;
private Handler<GoAway> goAwayHandler; private Handler<GoAway> goAwayHandler;
private Handler<Void> shutdownHandler; private Handler<Void> shutdownHandler;
private Handler<Buffer> pingHandler; private Handler<Buffer> pingHandler;
Expand Down Expand Up @@ -212,16 +212,22 @@ public synchronized void onSettingsAckRead(ChannelHandlerContext ctx) {
protected void onConnect() { protected void onConnect() {
} }


protected void concurrencyChanged() { protected void concurrencyChanged(long concurrency) {
} }


@Override @Override
public void onSettingsRead(ChannelHandlerContext ctx, Http2Settings settings) { public void onSettingsRead(ChannelHandlerContext ctx, Http2Settings settings) {
boolean changed = false; boolean changed;
if (settings.maxConcurrentStreams() != null) { Long val = settings.maxConcurrentStreams();
long val = settings.maxConcurrentStreams(); if (val != null) {
changed = val != maxConcurrentStreams; if (remoteSettings != null) {
changed = val != maxConcurrentStreams;
} else {
changed = false;
}
maxConcurrentStreams = val; maxConcurrentStreams = val;
} else {
changed = false;
} }
remoteSettings = settings; remoteSettings = settings;
synchronized (this) { synchronized (this) {
Expand All @@ -233,7 +239,7 @@ public void onSettingsRead(ChannelHandlerContext ctx, Http2Settings settings) {
} }
} }
if (changed) { if (changed) {
concurrencyChanged(); concurrencyChanged(maxConcurrentStreams);
} }
} }


Expand Down
63 changes: 35 additions & 28 deletions src/main/java/io/vertx/core/http/impl/HttpChannelConnector.java
View file
Expand Up @@ -25,7 +25,6 @@
import io.netty.handler.ssl.SslHandler; import io.netty.handler.ssl.SslHandler;
import io.netty.handler.timeout.IdleStateHandler; import io.netty.handler.timeout.IdleStateHandler;
import io.vertx.core.AsyncResult; import io.vertx.core.AsyncResult;
import io.vertx.core.Future;
import io.vertx.core.Handler; import io.vertx.core.Handler;
import io.vertx.core.http.HttpClientOptions; import io.vertx.core.http.HttpClientOptions;
import io.vertx.core.http.HttpVersion; import io.vertx.core.http.HttpVersion;
Expand All @@ -51,34 +50,41 @@ class HttpChannelConnector implements ConnectionProvider<HttpClientConnection> {
private final HttpClientMetrics metrics; private final HttpClientMetrics metrics;
private final SSLHelper sslHelper; private final SSLHelper sslHelper;
private final HttpVersion version; private final HttpVersion version;
private final long weight;
private final long http1Weight;
private final long http2Weight;
private final long http2MaxConcurrency;


HttpChannelConnector(HttpClientImpl client) { HttpChannelConnector(HttpClientImpl client) {
this.client = client; this.client = client;
this.options = client.getOptions(); this.options = client.getOptions();
this.metrics = client.metrics(); this.metrics = client.metrics();
this.sslHelper = client.getSslHelper(); this.sslHelper = client.getSslHelper();
this.version = options.getProtocolVersion(); this.version = options.getProtocolVersion();
this.http1Weight = client.getOptions().getHttp2MaxPoolSize();
this.http2Weight = client.getOptions().getMaxPoolSize();
this.weight = version == HttpVersion.HTTP_2 ? http2Weight : http1Weight;
this.http2MaxConcurrency = client.getOptions().getHttp2MultiplexingLimit() <= 0 ? Long.MAX_VALUE : client.getOptions().getHttp2MultiplexingLimit();
} }


@Override @Override
public Channel channel(HttpClientConnection conn) { public boolean isValid(HttpClientConnection conn) {
return conn.channel(); return conn.isValid();
} }


@Override @Override
public void close(HttpClientConnection conn) { public void close(HttpClientConnection conn) {
conn.close(); conn.close();
} }


public void connect( public long connect(
ConnectionListener<HttpClientConnection> listener, ConnectionListener<HttpClientConnection> listener,
Object endpointMetric, Object endpointMetric,
ContextImpl context, ContextImpl context,
String peerHost, String peerHost,
boolean ssl, boolean ssl,
String host, String host,
int port, int port) {
Handler<AsyncResult<HttpClientConnection>> handler) {


Bootstrap bootstrap = new Bootstrap(); Bootstrap bootstrap = new Bootstrap();
bootstrap.group(context.nettyEventLoop()); bootstrap.group(context.nettyEventLoop());
Expand Down Expand Up @@ -109,19 +115,19 @@ public void connect(
if (useAlpn) { if (useAlpn) {
if ("h2".equals(protocol)) { if ("h2".equals(protocol)) {
applyHttp2ConnectionOptions(ch.pipeline()); applyHttp2ConnectionOptions(ch.pipeline());
http2Connected(listener, endpointMetric, context, ch, handler); http2Connected(listener, endpointMetric, context, ch);
} else { } else {
applyHttp1xConnectionOptions(ch.pipeline()); applyHttp1xConnectionOptions(ch.pipeline());
HttpVersion fallbackProtocol = "http/1.0".equals(protocol) ? HttpVersion fallbackProtocol = "http/1.0".equals(protocol) ?
HttpVersion.HTTP_1_0 : HttpVersion.HTTP_1_1; HttpVersion.HTTP_1_0 : HttpVersion.HTTP_1_1;
http1xConnected(listener, fallbackProtocol, host, port, true, endpointMetric, context, ch, handler); http1xConnected(listener, fallbackProtocol, host, port, true, endpointMetric, context, ch);
} }
} else { } else {
applyHttp1xConnectionOptions(ch.pipeline()); applyHttp1xConnectionOptions(ch.pipeline());
http1xConnected(listener, version, host, port, true, endpointMetric, context, ch, handler); http1xConnected(listener, version, host, port, true, endpointMetric, context, ch);
} }
} else { } else {
handshakeFailure(ch, fut.cause(), handler); handshakeFailure(ch, fut.cause(), listener);
} }
}); });
} else { } else {
Expand Down Expand Up @@ -149,7 +155,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
p.remove(this); p.remove(this);
// Upgrade handler will remove itself // Upgrade handler will remove itself
applyHttp1xConnectionOptions(ch.pipeline()); applyHttp1xConnectionOptions(ch.pipeline());
http1xConnected(listener, HttpVersion.HTTP_1_1, host, port, false, endpointMetric, context, ch, handler); http1xConnected(listener, HttpVersion.HTTP_1_1, host, port, false, endpointMetric, context, ch);
} }
} }
@Override @Override
Expand All @@ -165,7 +171,7 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exc
@Override @Override
public void upgradeTo(ChannelHandlerContext ctx, FullHttpResponse upgradeResponse) throws Exception { public void upgradeTo(ChannelHandlerContext ctx, FullHttpResponse upgradeResponse) throws Exception {
applyHttp2ConnectionOptions(pipeline); applyHttp2ConnectionOptions(pipeline);
http2Connected(listener, endpointMetric, context, ch, handler); http2Connected(listener, endpointMetric, context, ch);
} }
}; };
HttpClientUpgradeHandler upgradeHandler = new HttpClientUpgradeHandler(httpCodec, upgradeCodec, 65536); HttpClientUpgradeHandler upgradeHandler = new HttpClientUpgradeHandler(httpCodec, upgradeCodec, 65536);
Expand All @@ -188,18 +194,20 @@ public void upgradeTo(ChannelHandlerContext ctx, FullHttpResponse upgradeRespons
// Upgrade handler do nothing // Upgrade handler do nothing
} else { } else {
if (version == HttpVersion.HTTP_2 && !client.getOptions().isHttp2ClearTextUpgrade()) { if (version == HttpVersion.HTTP_2 && !client.getOptions().isHttp2ClearTextUpgrade()) {
http2Connected(listener, endpointMetric, context, ch, handler); http2Connected(listener, endpointMetric, context, ch);
} else { } else {
http1xConnected(listener, version, host, port, false, endpointMetric, context, ch, handler); http1xConnected(listener, version, host, port, false, endpointMetric, context, ch);
} }
} }
} }
} else { } else {
connectFailed(null, handler, res.cause()); connectFailed(null, listener, res.cause());
} }
}; };


channelProvider.connect(client.getVertx(), bootstrap, client.getOptions().getProxyOptions(), SocketAddress.inetSocketAddress(port, host), channelInitializer, channelHandler); channelProvider.connect(client.getVertx(), bootstrap, client.getOptions().getProxyOptions(), SocketAddress.inetSocketAddress(port, host), channelInitializer, channelHandler);

return weight;
} }


private void applyConnectionOptions(Bootstrap bootstrap) { private void applyConnectionOptions(Bootstrap bootstrap) {
Expand Down Expand Up @@ -231,12 +239,12 @@ private void applyHttp1xConnectionOptions(ChannelPipeline pipeline) {
} }
} }


private void handshakeFailure(Channel ch, Throwable cause, Handler<AsyncResult<HttpClientConnection>> handler) { private void handshakeFailure(Channel ch, Throwable cause, ConnectionListener<HttpClientConnection> listener) {
SSLHandshakeException sslException = new SSLHandshakeException("Failed to create SSL connection"); SSLHandshakeException sslException = new SSLHandshakeException("Failed to create SSL connection");
if (cause != null) { if (cause != null) {
sslException.initCause(cause); sslException.initCause(cause);
} }
connectFailed(ch, handler, sslException); connectFailed(ch, listener, sslException);
} }


private void http1xConnected(ConnectionListener<HttpClientConnection> listener, private void http1xConnected(ConnectionListener<HttpClientConnection> listener,
Expand All @@ -246,8 +254,7 @@ private void http1xConnected(ConnectionListener<HttpClientConnection> listener,
boolean ssl, boolean ssl,
Object endpointMetric, Object endpointMetric,
ContextImpl context, ContextImpl context,
Channel ch, Channel ch) {
Handler<AsyncResult<HttpClientConnection>> handler) {
Http1xClientHandler clientHandler = new Http1xClientHandler( Http1xClientHandler clientHandler = new Http1xClientHandler(
listener, listener,
context, context,
Expand All @@ -259,19 +266,18 @@ private void http1xConnected(ConnectionListener<HttpClientConnection> listener,
endpointMetric, endpointMetric,
client.metrics()); client.metrics());
clientHandler.addHandler(conn -> { clientHandler.addHandler(conn -> {
handler.handle(Future.succeededFuture(conn)); listener.onConnectSuccess(conn, 1, ch, context, weight, http1Weight, Long.MAX_VALUE);
}); });
clientHandler.removeHandler(conn -> { clientHandler.removeHandler(conn -> {
listener.closed(conn); listener.onClose(conn);
}); });
ch.pipeline().addLast("handler", clientHandler); ch.pipeline().addLast("handler", clientHandler);
} }


private void http2Connected(ConnectionListener<HttpClientConnection> listener, private void http2Connected(ConnectionListener<HttpClientConnection> listener,
Object endpointMetric, Object endpointMetric,
ContextImpl context, ContextImpl context,
Channel ch, Channel ch) {
Handler<AsyncResult<HttpClientConnection>> resultHandler) {
try { try {
boolean upgrade; boolean upgrade;
upgrade = ch.pipeline().get(SslHandler.class) == null && options.isHttp2ClearTextUpgrade(); upgrade = ch.pipeline().get(SslHandler.class) == null && options.isHttp2ClearTextUpgrade();
Expand All @@ -291,26 +297,27 @@ private void http2Connected(ConnectionListener<HttpClientConnection> listener,
Object metric = metrics.connected(conn.remoteAddress(), conn.remoteName()); Object metric = metrics.connected(conn.remoteAddress(), conn.remoteName());
conn.metric(metric); conn.metric(metric);
} }
resultHandler.handle(Future.succeededFuture(conn)); long concurrency = conn.remoteSettings().getMaxConcurrentStreams();
listener.onConnectSuccess(conn, concurrency, ch, context, weight, http2Weight, http2MaxConcurrency);
}); });
handler.removeHandler(conn -> { handler.removeHandler(conn -> {
if (metrics != null) { if (metrics != null) {
metrics.endpointDisconnected(endpointMetric, conn.metric()); metrics.endpointDisconnected(endpointMetric, conn.metric());
} }
listener.closed(conn); listener.onClose(conn);
}); });
} catch (Exception e) { } catch (Exception e) {
connectFailed(ch, resultHandler, e); connectFailed(ch, listener, e);
} }
} }


private void connectFailed(Channel ch, Handler<AsyncResult<HttpClientConnection>> connectionExceptionHandler, Throwable t) { private void connectFailed(Channel ch, ConnectionListener<HttpClientConnection> listener, Throwable t) {
if (ch != null) { if (ch != null) {
try { try {
ch.close(); ch.close();
} catch (Exception ignore) { } catch (Exception ignore) {
} }
} }
connectionExceptionHandler.handle(Future.failedFuture(t)); listener.onConnectFailure(t, weight);
} }
} }
7 changes: 5 additions & 2 deletions src/main/java/io/vertx/core/http/impl/HttpClientImpl.java
View file
Expand Up @@ -33,8 +33,8 @@
import io.vertx.core.http.WebSocket; import io.vertx.core.http.WebSocket;
import io.vertx.core.http.WebsocketVersion; import io.vertx.core.http.WebsocketVersion;
import io.vertx.core.http.impl.pool.ConnectionManager; import io.vertx.core.http.impl.pool.ConnectionManager;
import io.vertx.core.http.impl.pool.ConnectionPool;
import io.vertx.core.http.impl.pool.ConnectionProvider; import io.vertx.core.http.impl.pool.ConnectionProvider;
import io.vertx.core.http.impl.pool.PoolOptions;
import io.vertx.core.http.impl.pool.Waiter; import io.vertx.core.http.impl.pool.Waiter;
import io.vertx.core.impl.ContextImpl; import io.vertx.core.impl.ContextImpl;
import io.vertx.core.impl.ContextInternal; import io.vertx.core.impl.ContextInternal;
Expand Down Expand Up @@ -160,7 +160,10 @@ public HttpClientImpl(VertxInternal vertx, HttpClientOptions options) {
} }


ConnectionProvider<HttpClientConnection> connector = new HttpChannelConnector(this); ConnectionProvider<HttpClientConnection> connector = new HttpChannelConnector(this);
Function<SocketAddress, ConnectionPool<HttpClientConnection>> poolFactory = sa -> new HttpConnectionPool(options.getProtocolVersion(), options); Function<SocketAddress, PoolOptions> poolFactory = sa -> {
long ms = options.getMaxPoolSize() * options.getHttp2MaxPoolSize();
return new PoolOptions().setMaxSize(ms);
};


websocketCM = new ConnectionManager<>(metrics, connector, poolFactory, options.getMaxWaitQueueSize()); websocketCM = new ConnectionManager<>(metrics, connector, poolFactory, options.getMaxWaitQueueSize());
httpCM = new ConnectionManager<>(metrics, connector, poolFactory, options.getMaxWaitQueueSize()); httpCM = new ConnectionManager<>(metrics, connector, poolFactory, options.getMaxWaitQueueSize());
Expand Down

0 comments on commit a57fb6b

Please sign in to comment.