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

Merge pull request #621 from spccold/master

Browse Source 
close zkclientx if necessary when stop canal and fix CanalInstanceWithManager#doInitEventParser bug
This commit is contained in:
agapple
2018-05-07 10:21:50 +08:00
committed by GitHub
parent c8f1d54fa1 7eb6fb3e8a
commit 5c2ed38d2f
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalController.java
View File

@@ -454,6 +454,10 @@ public class CanalController {
// 释放canal的工作节点 // 释放canal的工作节点
releaseCid(ZookeeperPathUtils.getCanalClusterNode(ip + ":" + port)); releaseCid(ZookeeperPathUtils.getCanalClusterNode(ip + ":" + port));
logger.info("## stop the canal server[{}:{}]", ip, port); logger.info("## stop the canal server[{}:{}]", ip, port);
if (zkclientx != null) {
zkclientx.close();
}
} }
private void initCid(String path) { private void initCid(String path) {

2
instance/manager/src/main/java/com/alibaba/otter/canal/instance/manager/CanalInstanceWithManager.java
View File

@@ -263,7 +263,7 @@ public class CanalInstanceWithManager extends AbstractCanalInstance {
mysqlEventParser.setMasterPosition(masterPosition); mysqlEventParser.setMasterPosition(masterPosition);
if (parameters.getPositions().size() > 1) { if (parameters.getPositions().size() > 1) {
EntryPosition standbyPosition = JsonUtils.unmarshalFromString(parameters.getPositions().get(0), EntryPosition standbyPosition = JsonUtils.unmarshalFromString(parameters.getPositions().get(1),
EntryPosition.class); EntryPosition.class);
mysqlEventParser.setStandbyPosition(standbyPosition); mysqlEventParser.setStandbyPosition(standbyPosition);
} }