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

Fix connection pool error. #437

Merged
merged 2 commits into from
Jun 19, 2019
Merged

Fix connection pool error. #437

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
4490d63
Fix connection pool error.
mikkokar Jun 18, 2019
2893291
SimpleConnectionPool: Rename `activeConnections` queue to `availableC…
mikkokar Jun 18, 2019
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
45 changes: 22 additions & 23 deletions ...ents/client/src/main/java/com/hotels/styx/client/connectionpool/SimpleConnectionPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public class SimpleConnectionPool implements ConnectionPool, Connection.Listener
private final Origin origin;

private final ConcurrentLinkedDeque<MonoSink<Connection>> waitingSubscribers;
private final Queue<Connection> activeConnections;
private final Queue<Connection> availableConnections;
private final AtomicInteger borrowedCount = new AtomicInteger();
private final SimpleConnectionPool.ConnectionPoolStats stats = new SimpleConnectionPool.ConnectionPoolStats();
private final AtomicInteger connectionAttempts = new AtomicInteger();
Expand All @@ -63,7 +63,7 @@ public SimpleConnectionPool(Origin origin, ConnectionPoolSettings poolSettings,
this.poolSettings = requireNonNull(poolSettings);
this.connectionSettings = new ConnectionSettings(poolSettings.connectTimeoutMillis());
this.connectionFactory = requireNonNull(connectionFactory);
this.activeConnections = new ConcurrentLinkedDeque<>();
this.availableConnections = new ConcurrentLinkedDeque<>();
this.waitingSubscribers = new ConcurrentLinkedDeque<>();
}

Expand All @@ -76,26 +76,17 @@ public Publisher<Connection> borrowConnection() {
return Mono.<Connection>create(sink -> {
Connection connection = dequeue();
if (connection != null) {
if (borrowedCount.getAndIncrement() < poolSettings.maxConnectionsPerHost()) {
sink.success(connection);
} else {
borrowedCount.decrementAndGet();
queueNewConnection(connection);
}
borrowedCount.incrementAndGet();
sink.success(connection);
} else {
if (waitingSubscribers.size() >= poolSettings.maxPendingConnectionsPerHost()) {
if (waitingSubscribers.size() < poolSettings.maxPendingConnectionsPerHost()) {
this.waitingSubscribers.add(sink.onDispose(() -> waitingSubscribers.remove(sink)));
dvlato marked this conversation as resolved.
Show resolved Hide resolved
newConnection();
} else {
sink.error(new MaxPendingConnectionsExceededException(
origin,
poolSettings.maxPendingConnectionsPerHost(),
poolSettings.maxPendingConnectionsPerHost()));
} else {
this.waitingSubscribers.add(sink.onCancel(() -> waitingSubscribers.remove(sink)));
int borrowed = borrowedCount.get();
int inEstablishment = connectionsInEstablishment.getAndIncrement();

if ((borrowed + inEstablishment) < poolSettings.maxConnectionsPerHost()) {
newConnection();
}
}
}
}).timeout(
Expand All @@ -104,6 +95,14 @@ public Publisher<Connection> borrowConnection() {
}

private void newConnection() {
int borrowed = borrowedCount.get();
int inEstablishment = connectionsInEstablishment.getAndIncrement();
dvlato marked this conversation as resolved.
Show resolved Hide resolved

if ((borrowed + inEstablishment) >= poolSettings.maxConnectionsPerHost()) {
connectionsInEstablishment.decrementAndGet();
return;
}

connectionAttempts.incrementAndGet();
newConnection(MAX_ATTEMPTS)
.doOnNext(it -> it.addConnectionListener(SimpleConnectionPool.this))
Expand All @@ -129,10 +128,10 @@ private Mono<Connection> newConnection(int attempts) {
}

private Connection dequeue() {
Connection connection = activeConnections.poll();
Connection connection = availableConnections.poll();

while (nonNull(connection) && !connection.isConnected()) {
connection = activeConnections.poll();
connection = availableConnections.poll();
}

return connection;
Expand All @@ -141,7 +140,7 @@ private Connection dequeue() {
private void queueNewConnection(Connection connection) {
MonoSink<Connection> subscriber = waitingSubscribers.poll();
if (subscriber == null) {
activeConnections.add(connection);
availableConnections.add(connection);
} else {
borrowedCount.incrementAndGet();
subscriber.success(connection);
Expand Down Expand Up @@ -181,7 +180,7 @@ public ConnectionPoolSettings settings() {
@Override
public void connectionClosed(Connection connection) {
terminatedConnections.incrementAndGet();
activeConnections.remove(connection);
availableConnections.remove(connection);
}

public ConnectionPool.Stats stats() {
Expand All @@ -192,7 +191,7 @@ public ConnectionPool.Stats stats() {
private class ConnectionPoolStats implements Stats {
@Override
public int availableConnectionCount() {
return activeConnections.size();
return availableConnections.size();
}

@Override
Expand Down Expand Up @@ -233,7 +232,7 @@ public int connectionsInEstablishment() {
@Override
public String toString() {
return MoreObjects.toStringHelper(this)
.add("\nactiveConnections", availableConnectionCount())
.add("\navailableConnections", availableConnectionCount())
.add("\npendingConnections", pendingConnectionCount())
.add("\nbusyConnections", busyConnectionCount())
.add("\nconnectionAttempts", connectionAttempts())
Expand Down
4 changes: 2 additions & 2 deletions ...ent/src/main/java/com/hotels/styx/client/connectionpool/StatsReportingConnectionPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ private static void registerMetrics(ConnectionPool hostConnectionPool, MetricReg
scopedRegistry.register("connection-failures", (Gauge<Integer>) () -> (int) stats.connectionFailures());
scopedRegistry.register("connections-closed", (Gauge<Integer>) () -> (int) stats.closedConnections());
scopedRegistry.register("connections-terminated", (Gauge<Integer>) () -> (int) stats.terminatedConnections());
scopedRegistry.register("in-establishment", (Gauge<Integer>) () -> (int) stats.connectionsInEstablishment());
scopedRegistry.register("connections-in-establishment", (Gauge<Integer>) () -> (int) stats.connectionsInEstablishment());
}

private void registerMetrics() {
Expand All @@ -107,7 +107,7 @@ private void removeMetrics() {
MetricRegistry scopedRegistry = getMetricScope(connectionPool);
asList("busy-connections", "pending-connections", "available-connections", "ttfb",
"connection-attempts", "connection-failures", "connections-closed", "connections-terminated",
"in-establishment")
"connections-in-establishment")
.forEach(scopedRegistry::deregister);
}

Expand Down
2 changes: 1 addition & 1 deletion ...test/unit/java/com/hotels/styx/client/connectionpool/SimpleConnectionPoolFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public void registersMetricsUnderOriginsScope() {
"origins.test-app.origin-X.connectionspool.pending-connections",
"origins.test-app.origin-X.connectionspool.available-connections",
"origins.test-app.origin-X.connectionspool.busy-connections",
"origins.test-app.origin-X.connectionspool.in-establishment"
"origins.test-app.origin-X.connectionspool.connections-in-establishment"
));
}
}
2 changes: 1 addition & 1 deletion ...est/unit/java/com/hotels/styx/client/connectionpool/StatsReportingConnectionPoolTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public void removesRegisteredMetricsOnClose() {
"origins.generic-app.backend-01.connectionspool.busy-connections",
"origins.generic-app.backend-01.connectionspool.pending-connections",
"origins.generic-app.backend-01.connectionspool.connection-attempts",
"origins.generic-app.backend-01.connectionspool.in-establishment",
"origins.generic-app.backend-01.connectionspool.connections-in-establishment",
"origins.generic-app.backend-01.connectionspool.connection-failures",
"origins.generic-app.backend-01.connectionspool.connections-closed",
"origins.generic-app.backend-01.connectionspool.connections-terminated"
Expand Down