mirror/dble
1
0
Fork 0
mirror of https://github.com/actiontech/dble.git synced 2026-05-22 07:39:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

inner-1945-supplement: report error packet when connection closed (#3562)

Browse Source 
inner-2062: fix npe

Signed-off-by: dcy10000 <dcy10000@gmail.com>
This commit is contained in:
dcy10000
2022-12-29 13:21:22 +08:00
parent b69846cfd0
commit 95d4cf26ae
1 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/actiontech/dble/backend/mysql/nio/MySQLConnectionHandler.java
+26 -1
View File
@@ -82,6 +82,9 @@ public class MySQLConnectionHandler extends BackendAsyncHandler {
@Override
protected void handleData(byte[] data) {
if (source.isClosed()) {
if (data != null && data.length > 4 && data[4] == ErrorPacket.FIELD_COUNT) {
parseErrorPacket(data, "connection close");
}
return;
}
switch (resultStatus) {
@@ -253,7 +256,7 @@ public class MySQLConnectionHandler extends BackendAsyncHandler {
protected void handleDataError(Exception e) {
LOGGER.info(this.source.toString() + " handle data error:", e);
while (dataQueue.size() > 0) {
dataQueue.clear();
clearTaskQueue();
// clear all data from the client
LockSupport.parkNanos(TimeUnit.MILLISECONDS.toNanos(1000));
}
@@ -265,4 +268,26 @@ public class MySQLConnectionHandler extends BackendAsyncHandler {
if (handler != null)
handler.connectionError(e, this.source);
}
private void clearTaskQueue() {
byte[] data;
while ((data = dataQueue.poll()) != null) {
if (data.length > 4 && data[4] == ErrorPacket.FIELD_COUNT) {
parseErrorPacket(data, "cleanup");
}
}
}
public void parseErrorPacket(byte[] data, String reason) {
try {
ErrorPacket errPkg = new ErrorPacket();
errPkg.read(data);
String errMsg = "errNo:" + errPkg.getErrNo() + " " + new String(errPkg.getMessage());
LOGGER.warn("no handler process the execute packet err,sql error:{},back service:{},from reason:{}", new Object[]{errMsg, source, reason});
} catch (RuntimeException e) {
LOGGER.info("error handle error-packet", e);
}
}
}