mirror/dble
1
0
Fork 0
mirror of https://github.com/actiontech/dble.git synced 2026-05-13 01:49:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

testOnBorrows takes no effect when backend connection was take directly from connection pool (#2519)

Browse Source
This commit is contained in:
Collapsar
2021-03-12 13:40:15 +08:00
committed by GitHub
parent 478515e1d4
commit 07c5f6b565
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/actiontech/dble/backend/datasource/PhysicalDbInstance.java
+18 -16
View File
@@ -127,33 +127,35 @@ public abstract class PhysicalDbInstance implements ReadTimeStatusInstance {
throw new IOException("primary dbInstance switched");
}
BackendConnection con = (BackendConnection) connectionPool.borrowDirectly(schema);
if (con != null) {
if (!StringUtil.equals(con.getSchema(), schema)) {
// need do sharding syn in before sql send
con.setSchema(schema);
if (!config.getPoolConfig().getTestOnBorrow()) {
BackendConnection con = (BackendConnection) connectionPool.borrowDirectly(schema);
if (con != null) {
if (!StringUtil.equals(con.getSchema(), schema)) {
// need do sharding syn in before sql send
con.setSchema(schema);
}
TraceManager.crossThread(con.getBackendService(), "backend-response-service", service);
con.getBackendService().setAttachment(attachment);
handler.connectionAcquired(con);
return;
}
TraceManager.crossThread(con.getBackendService(), "backend-response-service", service);
con.getBackendService().setAttachment(attachment);
handler.connectionAcquired(con);
return;
}
DbleServer.getInstance().getComplexQueryExecutor().execute(() -> {
BackendConnection con1;
BackendConnection conn;
try {
con1 = getConnection(schema, config.getPoolConfig().getConnectionTimeout());
conn = getConnection(schema, config.getPoolConfig().getConnectionTimeout());
} catch (IOException e) {
handler.connectionError(e, attachment);
return;
}
if (!StringUtil.equals(con1.getSchema(), schema)) {
if (!StringUtil.equals(conn.getSchema(), schema)) {
// need do sharding syn in before sql send
con1.setSchema(schema);
conn.setSchema(schema);
}
TraceManager.crossThread(con1.getBackendService(), "backend-response-service", service);
con1.getBackendService().setAttachment(attachment);
handler.connectionAcquired(con1);
TraceManager.crossThread(conn.getBackendService(), "backend-response-service", service);
conn.getBackendService().setAttachment(attachment);
handler.connectionAcquired(conn);
});
} finally {
TraceManager.finishSpan(traceObject);
src/main/java/com/actiontech/dble/backend/pool/ConnectionPool.java
-1
View File
@@ -148,7 +148,6 @@ public class ConnectionPool extends PoolBase implements PooledConnectionListener
}
}
public void release(final PooledConnection conn) {
if (poolConfig.getTestOnReturn()) {
ConnectionHeartBeatHandler heartBeatHandler = new ConnectionHeartBeatHandler((BackendConnection) conn, false, this);