Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 13:49:53 +01:00
Code Issues Projects Releases Wiki Activity

Limit the size of the DB connection pool.

Browse Source
This commit is contained in:
akwizgran
2022-04-08 15:00:48 +01:00
parent 5d952ff68e
commit 47d412dd0a
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
bramble-core/src/main/java/org/briarproject/bramble/db/JdbcDatabase.java
View File

@@ -103,6 +103,11 @@ abstract class JdbcDatabase implements Database<Connection> {
// Package access for testing // Package access for testing
static final int CODE_SCHEMA_VERSION = 50; static final int CODE_SCHEMA_VERSION = 50;
/**
* The maximum number of idle connections to keep open.
*/
private static final int MAX_CONNECTION_POOL_SIZE = 10;
// Time period offsets for incoming transport keys // Time period offsets for incoming transport keys
private static final int OFFSET_PREV = -1; private static final int OFFSET_PREV = -1;
private static final int OFFSET_CURR = 0; private static final int OFFSET_CURR = 0;
@@ -364,7 +369,7 @@ abstract class JdbcDatabase implements Database<Connection> {
private final Condition connectionsChanged = connectionsLock.newCondition(); private final Condition connectionsChanged = connectionsLock.newCondition();
@GuardedBy("connectionsLock") @GuardedBy("connectionsLock")
private final LinkedList<Connection> connections = new LinkedList<>(); private final LinkedList<Connection> connectionPool = new LinkedList<>();
@GuardedBy("connectionsLock") @GuardedBy("connectionsLock")
private int openConnections = 0; private int openConnections = 0;
@@ -572,7 +577,7 @@ abstract class JdbcDatabase implements Database<Connection> {
connectionsLock.lock(); connectionsLock.lock();
try { try {
if (closed) throw new DbClosedException(); if (closed) throw new DbClosedException();
txn = connections.poll(); txn = connectionPool.poll();
logConnectionCounts(); logConnectionCounts();
} finally { } finally {
connectionsLock.unlock(); connectionsLock.unlock();
@@ -606,7 +611,7 @@ abstract class JdbcDatabase implements Database<Connection> {
private void logConnectionCounts() { private void logConnectionCounts() {
if (LOG.isLoggable(FINE)) { if (LOG.isLoggable(FINE)) {
LOG.fine(openConnections + " connections open, " LOG.fine(openConnections + " connections open, "
+ connections.size() + " in pool"); + connectionPool.size() + " in pool");
} }
} }
@@ -649,14 +654,18 @@ abstract class JdbcDatabase implements Database<Connection> {
} }
private void returnConnectionToPool(Connection txn) { private void returnConnectionToPool(Connection txn) {
boolean shouldClose;
connectionsLock.lock(); connectionsLock.lock();
try { try {
connections.add(txn); shouldClose = connectionPool.size() >= MAX_CONNECTION_POOL_SIZE;
if (shouldClose) openConnections--;
else connectionPool.add(txn);
logConnectionCounts(); logConnectionCounts();
connectionsChanged.signalAll(); connectionsChanged.signalAll();
} finally { } finally {
connectionsLock.unlock(); connectionsLock.unlock();
} }
if (shouldClose) tryToClose(txn, LOG, WARNING);
} }
void closeAllConnections() { void closeAllConnections() {
@@ -664,9 +673,9 @@ abstract class JdbcDatabase implements Database<Connection> {
connectionsLock.lock(); connectionsLock.lock();
try { try {
closed = true; closed = true;
for (Connection c : connections) tryToClose(c, LOG, WARNING); for (Connection c : connectionPool) tryToClose(c, LOG, WARNING);
openConnections -= connections.size(); openConnections -= connectionPool.size();
connections.clear(); connectionPool.clear();
while (openConnections > 0) { while (openConnections > 0) {
if (LOG.isLoggable(INFO)) { if (LOG.isLoggable(INFO)) {
LOG.info("Waiting for " + openConnections LOG.info("Waiting for " + openConnections
@@ -678,9 +687,9 @@ abstract class JdbcDatabase implements Database<Connection> {
LOG.warning("Interrupted while closing connections"); LOG.warning("Interrupted while closing connections");
interrupted = true; interrupted = true;
} }
for (Connection c : connections) tryToClose(c, LOG, WARNING); for (Connection c : connectionPool) tryToClose(c, LOG, WARNING);
openConnections -= connections.size(); openConnections -= connectionPool.size();
connections.clear(); connectionPool.clear();
} }
LOG.info("All connections closed"); LOG.info("All connections closed");
} finally { } finally {