chenjl/canal
1
0
Fork 0
mirror of https://github.com/alibaba/canal.git synced 2026-11-04 00:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

1. AbstractEventParser 中应该对multiStageCoprocess每次在while最后进行stop而不是reset， reset会在mysqlMultiStageCoprocessor中重新创建两个线程池， 如果在dump出错的情况下， 会无限多的创建multiStageCoprocess而且不释放

Browse Source 
2. MySqlMultiStageComprocessor中需要判断是否已经shutdown， 实际情况中存在shutdown为true而terminal一直为false的情况
This commit is contained in:
wallellen
2018-10-12 18:27:32 +08:00
parent 4d36c60738
commit 7c44e5933d
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
parse/src/main/java/com/alibaba/otter/canal/parse/inbound/AbstractEventParser.java
View File

@@ -317,10 +317,10 @@ public abstract class AbstractEventParser<EVENT> extends AbstractCanalLifeCycle
eventSink.interrupt(); eventSink.interrupt();
transactionBuffer.reset();// 重置一下缓冲队列，重新记录数据 transactionBuffer.reset();// 重置一下缓冲队列，重新记录数据
binlogParser.reset();// 重新置位 binlogParser.reset();// 重新置位
if (multiStageCoprocessor != null) { if (multiStageCoprocessor != null && multiStageCoprocessor.isStart()) {
// 处理 RejectedExecutionException // 处理 RejectedExecutionException
try { try {
multiStageCoprocessor.reset(); multiStageCoprocessor.stop();
} catch (Throwable t) { } catch (Throwable t) {
logger.debug("multi processor rejected:", t); logger.debug("multi processor rejected:", t);
} }

8
parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlMultiStageCoprocessor.java
View File

@@ -138,6 +138,10 @@ public class MysqlMultiStageCoprocessor extends AbstractCanalLifeCycle implement
try { try {
parserExecutor.shutdownNow(); parserExecutor.shutdownNow();
while (!parserExecutor.awaitTermination(1, TimeUnit.SECONDS)) { while (!parserExecutor.awaitTermination(1, TimeUnit.SECONDS)) {
if (parserExecutor.isShutdown() || parserExecutor.isTerminated()) {
break;
}
parserExecutor.shutdownNow(); parserExecutor.shutdownNow();
} }
} catch (Throwable e) { } catch (Throwable e) {
@@ -147,6 +151,10 @@ public class MysqlMultiStageCoprocessor extends AbstractCanalLifeCycle implement
try { try {
stageExecutor.shutdownNow(); stageExecutor.shutdownNow();
while (!stageExecutor.awaitTermination(1, TimeUnit.SECONDS)) { while (!stageExecutor.awaitTermination(1, TimeUnit.SECONDS)) {
if (stageExecutor.isShutdown() || stageExecutor.isTerminated()) {
break;
}
stageExecutor.shutdownNow(); stageExecutor.shutdownNow();
} }
} catch (Throwable e) { } catch (Throwable e) {