From 74bc6368f235b0dc7f48e5e02921c19d253e31a4 Mon Sep 17 00:00:00 2001 From: Neal Hu Date: Wed, 13 Jun 2018 11:15:01 +0800 Subject: [PATCH 1/2] stop running in example --- .../com/alibaba/otter/canal/example/AbstractCanalClientTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/example/src/main/java/com/alibaba/otter/canal/example/AbstractCanalClientTest.java b/example/src/main/java/com/alibaba/otter/canal/example/AbstractCanalClientTest.java index 33ea6550..c5fa3d14 100644 --- a/example/src/main/java/com/alibaba/otter/canal/example/AbstractCanalClientTest.java +++ b/example/src/main/java/com/alibaba/otter/canal/example/AbstractCanalClientTest.java @@ -97,6 +97,7 @@ public class AbstractCanalClientTest { return; } connector.stopRunning(); + running = false; if (thread != null) { try { thread.join(); From 967f8d6b0fb4e448acd7b7514e4fed1054affa06 Mon Sep 17 00:00:00 2001 From: Neal Hu Date: Thu, 14 Jun 2018 21:28:10 +0800 Subject: [PATCH 2/2] Fixes #697 ClientRunningMonitor shutdown delayExector threadpool --- .../otter/canal/client/impl/running/ClientRunningMonitor.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client/src/main/java/com/alibaba/otter/canal/client/impl/running/ClientRunningMonitor.java b/client/src/main/java/com/alibaba/otter/canal/client/impl/running/ClientRunningMonitor.java index 4c2a9f66..32202dc1 100644 --- a/client/src/main/java/com/alibaba/otter/canal/client/impl/running/ClientRunningMonitor.java +++ b/client/src/main/java/com/alibaba/otter/canal/client/impl/running/ClientRunningMonitor.java @@ -98,6 +98,10 @@ public class ClientRunningMonitor extends AbstractCanalLifeCycle { String path = ZookeeperPathUtils.getDestinationClientRunning(this.destination, clientData.getClientId()); zkClient.unsubscribeDataChanges(path, dataListener); releaseRunning(); // 尝试一下release + //Fix issue #697 + if (delayExector != null) { + delayExector.shutdown(); + } } // 改动记录：