mirror of
https://github.com/alibaba/canal.git
synced 2026-11-04 00:30:15 +08:00
Further improvement for issue #771.
This commit is contained in:
@@ -64,6 +64,7 @@ public class MysqlMultiStageCoprocessor extends AbstractCanalLifeCycle implement
|
|||||||
private ExecutorService stageExecutor;
|
private ExecutorService stageExecutor;
|
||||||
private String destination;
|
private String destination;
|
||||||
private volatile CanalParseException exception;
|
private volatile CanalParseException exception;
|
||||||
|
private volatile RuntimeException incident;
|
||||||
|
|
||||||
public MysqlMultiStageCoprocessor(int ringBufferSize, int parserThreadCount, LogEventConvert logEventConvert,
|
public MysqlMultiStageCoprocessor(int ringBufferSize, int parserThreadCount, LogEventConvert logEventConvert,
|
||||||
EventTransactionBuffer transactionBuffer, String destination){
|
EventTransactionBuffer transactionBuffer, String destination){
|
||||||
@@ -78,6 +79,7 @@ public class MysqlMultiStageCoprocessor extends AbstractCanalLifeCycle implement
|
|||||||
public void start() {
|
public void start() {
|
||||||
super.start();
|
super.start();
|
||||||
this.exception = null;
|
this.exception = null;
|
||||||
|
this.incident = null;
|
||||||
this.disruptorMsgBuffer = RingBuffer.createSingleProducer(new MessageEventFactory(),
|
this.disruptorMsgBuffer = RingBuffer.createSingleProducer(new MessageEventFactory(),
|
||||||
ringBufferSize,
|
ringBufferSize,
|
||||||
new BlockingWaitStrategy());
|
new BlockingWaitStrategy());
|
||||||
@@ -148,13 +150,17 @@ public class MysqlMultiStageCoprocessor extends AbstractCanalLifeCycle implement
|
|||||||
|
|
||||||
public boolean publish(LogBuffer buffer, String binlogFileName) {
|
public boolean publish(LogBuffer buffer, String binlogFileName) {
|
||||||
if (!isStart()) {
|
if (!isStart()) {
|
||||||
|
if (exception != null) {
|
||||||
|
throw exception;
|
||||||
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
/* 由于改为processor退出不stop,那么需要由exception标识coprocessor是否正常工作。
|
|
||||||
|
/* 由于改为processor仅终止自身stage而不是stop,那么需要由incident标识coprocessor是否正常工作。
|
||||||
* 让dump线程能够及时感知
|
* 让dump线程能够及时感知
|
||||||
*/
|
*/
|
||||||
if (exception != null) {
|
if (incident != null) {
|
||||||
throw exception;
|
throw incident;
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean interupted = false;
|
boolean interupted = false;
|
||||||
@@ -399,11 +405,12 @@ public class MysqlMultiStageCoprocessor extends AbstractCanalLifeCycle implement
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void handleEventException(final Throwable ex, final long sequence, final Object event) {
|
public void handleEventException(final Throwable ex, final long sequence, final Object event) {
|
||||||
/*如果仅仅抛出去,onShutdown会调用stop(),与instance主parse线程的reset()产生竞争,导致向terminated ExecutorService提交新task
|
/*
|
||||||
|
* 若异常不是onEvent body里产生的。如果仅仅抛出去,onShutdown会调用stop(),与dump线程的reset()产生竞争,导致向terminated ExecutorService提交新task
|
||||||
* #771场景中的异常是InterruptedException,由shutdownNow产生。
|
* #771场景中的异常是InterruptedException,由shutdownNow产生。
|
||||||
*/
|
*/
|
||||||
exception = new CanalParseException(ex);
|
incident = new RuntimeException(ex);
|
||||||
throw exception;
|
throw incident;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user