|
@@ -2,6 +2,9 @@ package com.alibaba.otter.canal.parse.driver.mysql;
|
|
|
|
|
|
import java.io.IOException;
|
|
|
import java.net.InetSocketAddress;
|
|
|
+import com.alibaba.otter.canal.parse.driver.mysql.socket.SocketChannel;
|
|
|
+import com.alibaba.otter.canal.parse.driver.mysql.socket.SocketChannelPool;
|
|
|
+
|
|
|
import java.util.concurrent.atomic.AtomicBoolean;
|
|
|
|
|
|
import org.apache.commons.lang.exception.ExceptionUtils;
|
|
@@ -14,8 +17,6 @@ import com.alibaba.otter.canal.parse.driver.mysql.packets.client.QuitCommandPack
|
|
|
import com.alibaba.otter.canal.parse.driver.mysql.packets.server.ErrorPacket;
|
|
|
import com.alibaba.otter.canal.parse.driver.mysql.packets.server.HandshakeInitializationPacket;
|
|
|
import com.alibaba.otter.canal.parse.driver.mysql.packets.server.Reply323Packet;
|
|
|
-import com.alibaba.otter.canal.parse.driver.mysql.socket.SocketChannel;
|
|
|
-import com.alibaba.otter.canal.parse.driver.mysql.socket.SocketChannelPool;
|
|
|
import com.alibaba.otter.canal.parse.driver.mysql.utils.MySQLPasswordEncrypter;
|
|
|
import com.alibaba.otter.canal.parse.driver.mysql.utils.PacketManager;
|
|
|
|
|
@@ -101,8 +102,7 @@ public class MysqlConnector {
|
|
|
MysqlUpdateExecutor executor = new MysqlUpdateExecutor(connector);
|
|
|
executor.update("KILL CONNECTION " + connectionId);
|
|
|
} catch (Exception e) {
|
|
|
- // 忽略具体异常
|
|
|
- logger.info("KILL DUMP " + connectionId + " failure:" + ExceptionUtils.getStackTrace(e));
|
|
|
+ throw new IOException("KILL DUMP " + connectionId + " failure:" + ExceptionUtils.getStackTrace(e));
|
|
|
} finally {
|
|
|
if (connector != null) {
|
|
|
connector.disconnect();
|
|
@@ -140,7 +140,7 @@ public class MysqlConnector {
|
|
|
HeaderPacket quitHeader = new HeaderPacket();
|
|
|
quitHeader.setPacketBodyLength(cmdBody.length);
|
|
|
quitHeader.setPacketSequenceNumber((byte) 0x00);
|
|
|
- PacketManager.write(channel,quitHeader.toBytes(),cmdBody);
|
|
|
+ PacketManager.writePkg(channel, quitHeader.toBytes(),cmdBody);
|
|
|
}
|
|
|
|
|
|
private void negotiate(SocketChannel channel) throws IOException {
|
|
@@ -177,7 +177,7 @@ public class MysqlConnector {
|
|
|
h.setPacketBodyLength(clientAuthPkgBody.length);
|
|
|
h.setPacketSequenceNumber((byte) (header.getPacketSequenceNumber() + 1));
|
|
|
|
|
|
- PacketManager.write(channel,h.toBytes(), clientAuthPkgBody);
|
|
|
+ PacketManager.writePkg(channel, h.toBytes(), clientAuthPkgBody);
|
|
|
logger.info("client authentication packet is sent out.");
|
|
|
|
|
|
// check auth result
|
|
@@ -213,7 +213,7 @@ public class MysqlConnector {
|
|
|
h323.setPacketBodyLength(b323Body.length);
|
|
|
h323.setPacketSequenceNumber((byte) (packetSequenceNumber + 1));
|
|
|
|
|
|
- PacketManager.write(channel, h323.toBytes(), b323Body);
|
|
|
+ PacketManager.writePkg(channel, h323.toBytes(), b323Body);
|
|
|
logger.info("client 323 authentication packet is sent out.");
|
|
|
// check auth result
|
|
|
HeaderPacket header = PacketManager.readHeader(channel, 4);
|