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 #1442 from rewerma/master

Browse Source 
fixed #1430
This commit is contained in:
rewerma
2019-01-17 15:18:40 +08:00
committed by GitHub
parent 4beb1e6855 ba9d9dea6d
commit cbe88af2e3
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,7 +68,6 @@ public class CanalController {
private CanalInstanceGenerator instanceGenerator; private CanalInstanceGenerator instanceGenerator;
private ZkClientx zkclientx; private ZkClientx zkclientx;
private String zkServers;
private CanalMQStarter canalMQStarter; private CanalMQStarter canalMQStarter;
@@ -133,7 +132,6 @@ public class CanalController {
} }
final String zkServers = getProperty(properties, CanalConstants.CANAL_ZKSERVERS); final String zkServers = getProperty(properties, CanalConstants.CANAL_ZKSERVERS);
if (StringUtils.isNotEmpty(zkServers)) { if (StringUtils.isNotEmpty(zkServers)) {
this.zkServers = zkServers;
zkclientx = ZkClientx.getZkClient(zkServers); zkclientx = ZkClientx.getZkClient(zkServers);
// 初始化系统目录 // 初始化系统目录
zkclientx.createPersistent(ZookeeperPathUtils.DESTINATION_ROOT_NODE, true); zkclientx.createPersistent(ZookeeperPathUtils.DESTINATION_ROOT_NODE, true);
@@ -508,11 +506,9 @@ public class CanalController {
if (zkclientx != null) { if (zkclientx != null) {
zkclientx.close(); zkclientx.close();
if (zkServers != null) {
ZkClientx.removeZkClient(zkServers);
}
} }
//关闭时清理缓存
if (instanceConfigs != null) { if (instanceConfigs != null) {
instanceConfigs.clear(); instanceConfigs.clear();
} }

4
meta/src/main/java/com/alibaba/otter/canal/meta/ZooKeeperMetaManager.java
View File

@@ -56,7 +56,7 @@ public class ZooKeeperMetaManager extends AbstractCanalLifeCycle implements Cana
} }
public void stop() { public void stop() {
zkClientx = null; zkClientx = null; //关闭时置空
super.stop(); super.stop();
} }
@@ -102,7 +102,7 @@ public class ZooKeeperMetaManager extends AbstractCanalLifeCycle implements Cana
} }
public List<ClientIdentity> listAllSubscribeInfo(String destination) throws CanalMetaManagerException { public List<ClientIdentity> listAllSubscribeInfo(String destination) throws CanalMetaManagerException {
if (zkClientx == null) { if (zkClientx == null) { //重新加载时可能为空
return new ArrayList<ClientIdentity>(); return new ArrayList<ClientIdentity>();
} }
String path = ZookeeperPathUtils.getDestinationPath(destination); String path = ZookeeperPathUtils.getDestinationPath(destination);