mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-18 14:58:47 +00:00
Further changes for #79 - returning/cleanup of bad connection
This commit is contained in:
1 parent
f85fa2c21d
commit
182e027521
3 files changed
+34
-13
No files matched your search
@@ -597,12 +597,35 @@ public class DataSourcePool implements DataSource {
|
||||
*/
|
||||
protected void returnConnection(PooledConnection pooledConnection) {
|
||||
|
||||
if (poolListener != null) {
|
||||
poolListener.onBeforeReturnConnection(pooledConnection);
|
||||
}
|
||||
queue.returnPooledConnection(pooledConnection);
|
||||
// return a normal 'good' connection
|
||||
returnTheConnection(pooledConnection, false);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* This is a bad connection and must be removed from the pool's busy list and fully closed.
|
||||
*/
|
||||
protected void returnConnectionForceClose(PooledConnection pooledConnection) {
|
||||
|
||||
returnTheConnection(pooledConnection, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Return connection. If forceClose is true then this is a bad connection that
|
||||
* must be removed and closed fully.
|
||||
*/
|
||||
private void returnTheConnection(PooledConnection pooledConnection, boolean forceClose) {
|
||||
|
||||
if (poolListener != null && !forceClose) {
|
||||
poolListener.onBeforeReturnConnection(pooledConnection);
|
||||
}
|
||||
queue.returnPooledConnection(pooledConnection, forceClose);
|
||||
|
||||
if (forceClose) {
|
||||
// Got a bad connection so check the pool
|
||||
checkDataSource();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Collect statistics of a connection that is fully closing
|
||||
*/
|
||||
|
||||
@@ -508,9 +508,8 @@ public class PooledConnection extends ConnectionDelegator {
|
||||
|
||||
if (hadErrors) {
|
||||
if (!pool.validateConnection(this)) {
|
||||
// the connection is BAD, close it and test the pool
|
||||
closeConnectionFully(false);
|
||||
pool.checkDataSource();
|
||||
// the connection is BAD, remove it, close it and test the pool
|
||||
pool.returnConnectionForceClose(this);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -535,10 +534,9 @@ public class PooledConnection extends ConnectionDelegator {
|
||||
pool.returnConnection(this);
|
||||
|
||||
} catch (Exception ex) {
|
||||
// the connection is BAD, close it and test the pool
|
||||
// the connection is BAD, remove it, close it and test the pool
|
||||
logger.warn("Error when trying to return connection to pool, closing fully.", ex);
|
||||
closeConnectionFully(false);
|
||||
pool.checkDataSource();
|
||||
pool.returnConnectionForceClose(this);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -238,7 +238,7 @@ public class PooledConnectionQueue {
|
||||
/**
|
||||
* Return a PooledConnection.
|
||||
*/
|
||||
protected void returnPooledConnection(PooledConnection c) {
|
||||
protected void returnPooledConnection(PooledConnection c, boolean forceClose) {
|
||||
|
||||
final ReentrantLock lock = this.lock;
|
||||
lock.lock();
|
||||
@@ -246,7 +246,7 @@ public class PooledConnectionQueue {
|
||||
if (!busyList.remove(c)) {
|
||||
logger.error("Connection [{}] not found in BusyList? ", c);
|
||||
}
|
||||
if (c.shouldTrimOnReturn(lastResetTime, maxAgeMillis)) {
|
||||
if (forceClose || c.shouldTrimOnReturn(lastResetTime, maxAgeMillis)) {
|
||||
c.closeConnectionFully(false);
|
||||
|
||||
} else {
|
||||
|
||||
Reference in new issue
Block a user