mirror/dble
1
0
Fork 0
mirror of https://github.com/actiontech/dble.git synced 2026-01-05 20:30:40 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix timer thread hang inner 1790 & 2037 (#3287)

Browse Source 
fix timer thread  hang inner 1790 & 2037 (#3287)
This commit is contained in:
ylinzhu
2023-05-18 14:50:44 +08:00
committed by GitHub
parent b55e43198b ae8672f0db
commit 4eeacd2194
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/actiontech/dble/backend/mysql/nio/handler/NewConnectionRespHandler.java
View File

@@ -1,8 +1,8 @@
/*
* Copyright (C) 2016-2019 ActionTech.
* based on code by MyCATCopyrightHolder Copyright (c) 2013, OpenCloudDB/MyCAT.
* License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher.
*/
* Copyright (C) 2016-2019 ActionTech.
* based on code by MyCATCopyrightHolder Copyright (c) 2013, OpenCloudDB/MyCAT.
* License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher.
*/
package com.actiontech.dble.backend.mysql.nio.handler;
import com.actiontech.dble.backend.BackendConnection;
@@ -14,6 +14,7 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.ReentrantLock;
@@ -26,9 +27,14 @@ public class NewConnectionRespHandler implements ResponseHandler {
public BackendConnection getBackConn() throws IOException {
lock.lock();
boolean await = true;
try {
if (errMsg == null && backConn == null) {
initiated.await();
await = initiated.await(10000, TimeUnit.MILLISECONDS);
}
if (!await) {
errMsg = "test conn timeout,TCP connection may be lost";
LOGGER.warn(errMsg);
}
if (backConn == null) {
throw new IOException(errMsg);
@@ -117,6 +123,7 @@ public class NewConnectionRespHandler implements ResponseHandler {
lock.unlock();
}
LOGGER.info("connectionClose " + conn);
}
}

1
src/main/java/com/actiontech/dble/net/AbstractConnection.java
View File

@@ -285,7 +285,6 @@ public abstract class AbstractConnection implements NIOConnection {
if (got < 0) {
if (this instanceof MySQLConnection) {
((MySQLConnection) this).closeInner("stream closed");
((MySQLConnection) this).onConnectFailed(new IOException("stream closed"));
} else {
this.close("stream closed");
}

6
src/main/java/com/actiontech/dble/net/NIOReactor.java
View File

@@ -123,16 +123,10 @@ public final class NIOReactor {
con.asyncRead();
} catch (IOException e) {
con.close("program err:" + e.toString());
if (con instanceof MySQLConnection) {
((MySQLConnection) con).onConnectFailed(e);
}
continue;
} catch (Exception e) {
LOGGER.warn("caught err:", e);
con.close("program err:" + e.toString());
if (con instanceof MySQLConnection) {
((MySQLConnection) con).onConnectFailed(e);
}
continue;
}
}