Further improvement for issue #771.

This commit is contained in:
Chuanyi Li L
2018-07-26 14:30:42 +08:00
parent 129051a56e
commit 72b907a75f

View File

@@ -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,14 +150,18 @@ public class MysqlMultiStageCoprocessor extends AbstractCanalLifeCycle implement
public boolean publish(LogBuffer buffer, String binlogFileName) { public boolean publish(LogBuffer buffer, String binlogFileName) {
if (!isStart()) { if (!isStart()) {
return false;
}
/* 由于改为processor退出不stop,那么需要由exception标识coprocessor是否正常工作。
* 让dump线程能够及时感知
*/
if (exception != null) { if (exception != null) {
throw exception; throw exception;
} }
return false;
}
/* 由于改为processor仅终止自身stage而不是stop,那么需要由incident标识coprocessor是否正常工作。
* 让dump线程能够及时感知
*/
if (incident != null) {
throw incident;
}
boolean interupted = false; boolean interupted = false;
do { do {
@@ -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