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

fixed issue #1940 #2088 , add canal.register.ip support docker

Browse Source
This commit is contained in:
agapple
2019-08-22 23:48:19 +08:00
parent bd974e3da8
commit 3a74f6124a
4 changed files with 106 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalConstants.java
View File

@@ -14,6 +14,7 @@ public class CanalConstants {
public static final String ROOT = "canal"; public static final String ROOT = "canal";
public static final String CANAL_ID = ROOT + "." + "id"; public static final String CANAL_ID = ROOT + "." + "id";
public static final String CANAL_IP = ROOT + "." + "ip"; public static final String CANAL_IP = ROOT + "." + "ip";
public static final String CANAL_REGISTER_IP = ROOT + "." + "register.ip";
public static final String CANAL_PORT = ROOT + "." + "port"; public static final String CANAL_PORT = ROOT + "." + "port";
public static final String CANAL_METRICS_PULL_PORT = ROOT + "." + "metrics.pull.port"; public static final String CANAL_METRICS_PULL_PORT = ROOT + "." + "metrics.pull.port";
public static final String CANAL_ADMIN_JMX_PORT = ROOT + "." + "admin.jmx.port"; public static final String CANAL_ADMIN_JMX_PORT = ROOT + "." + "admin.jmx.port";

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

@@ -54,6 +54,7 @@ public class CanalController {
private static final Logger logger = LoggerFactory.getLogger(CanalController.class); private static final Logger logger = LoggerFactory.getLogger(CanalController.class);
private Long cid; private Long cid;
private String ip; private String ip;
private String registerIp;
private int port; private int port;
// 默认使用spring的方式载入 // 默认使用spring的方式载入
private Map<String, InstanceConfig> instanceConfigs; private Map<String, InstanceConfig> instanceConfigs;
@@ -108,6 +109,7 @@ public class CanalController {
// 准备canal server // 准备canal server
cid = Long.valueOf(getProperty(properties, CanalConstants.CANAL_ID)); cid = Long.valueOf(getProperty(properties, CanalConstants.CANAL_ID));
ip = getProperty(properties, CanalConstants.CANAL_IP); ip = getProperty(properties, CanalConstants.CANAL_IP);
registerIp = getProperty(properties, CanalConstants.CANAL_REGISTER_IP);
port = Integer.valueOf(getProperty(properties, CanalConstants.CANAL_PORT)); port = Integer.valueOf(getProperty(properties, CanalConstants.CANAL_PORT));
embededCanalServer = CanalServerWithEmbedded.instance(); embededCanalServer = CanalServerWithEmbedded.instance();
embededCanalServer.setCanalInstanceGenerator(instanceGenerator);// 设置自定义的instanceGenerator embededCanalServer.setCanalInstanceGenerator(instanceGenerator);// 设置自定义的instanceGenerator
@@ -127,9 +129,17 @@ public class CanalController {
} }
// 处理下ip为空，默认使用hostIp暴露到zk中 // 处理下ip为空，默认使用hostIp暴露到zk中
if (StringUtils.isEmpty(ip) && StringUtils.isEmpty(registerIp)) {
ip = registerIp = AddressUtils.getHostIp();
}
if (StringUtils.isEmpty(ip)) { if (StringUtils.isEmpty(ip)) {
ip = AddressUtils.getHostIp(); ip = AddressUtils.getHostIp();
} }
if (StringUtils.isEmpty(registerIp)) {
registerIp = ip; // 兼容以前配置
}
final String zkServers = getProperty(properties, CanalConstants.CANAL_ZKSERVERS); final String zkServers = getProperty(properties, CanalConstants.CANAL_ZKSERVERS);
if (StringUtils.isNotEmpty(zkServers)) { if (StringUtils.isNotEmpty(zkServers)) {
zkclientx = ZkClientx.getZkClient(zkServers); zkclientx = ZkClientx.getZkClient(zkServers);
@@ -138,10 +148,9 @@ public class CanalController {
zkclientx.createPersistent(ZookeeperPathUtils.CANAL_CLUSTER_ROOT_NODE, true); zkclientx.createPersistent(ZookeeperPathUtils.CANAL_CLUSTER_ROOT_NODE, true);
} }
final ServerRunningData serverData = new ServerRunningData(cid, ip + ":" + port); final ServerRunningData serverData = new ServerRunningData(cid, registerIp + ":" + port);
ServerRunningMonitors.setServerData(serverData); ServerRunningMonitors.setServerData(serverData);
ServerRunningMonitors ServerRunningMonitors.setRunningMonitors(MigrateMap.makeComputingMap(new Function<String, ServerRunningMonitor>() {
.setRunningMonitors(MigrateMap.makeComputingMap(new Function<String, ServerRunningMonitor>() {
public ServerRunningMonitor apply(final String destination) { public ServerRunningMonitor apply(final String destination) {
ServerRunningMonitor runningMonitor = new ServerRunningMonitor(serverData); ServerRunningMonitor runningMonitor = new ServerRunningMonitor(serverData);
@@ -176,7 +185,7 @@ public class CanalController {
try { try {
if (zkclientx != null) { if (zkclientx != null) {
final String path = ZookeeperPathUtils.getDestinationClusterNode(destination, final String path = ZookeeperPathUtils.getDestinationClusterNode(destination,
ip + ":" + port); registerIp + ":" + port);
initCid(path); initCid(path);
zkclientx.subscribeStateChanges(new IZkStateListener() { zkclientx.subscribeStateChanges(new IZkStateListener() {
@@ -204,7 +213,7 @@ public class CanalController {
MDC.put(CanalConstants.MDC_DESTINATION, String.valueOf(destination)); MDC.put(CanalConstants.MDC_DESTINATION, String.valueOf(destination));
if (zkclientx != null) { if (zkclientx != null) {
final String path = ZookeeperPathUtils.getDestinationClusterNode(destination, final String path = ZookeeperPathUtils.getDestinationClusterNode(destination,
ip + ":" + port); registerIp + ":" + port);
releaseCid(path); releaseCid(path);
} }
} finally { } finally {
@@ -266,8 +275,7 @@ public class CanalController {
instanceConfigMonitors = MigrateMap.makeComputingMap(new Function<InstanceMode, InstanceConfigMonitor>() { instanceConfigMonitors = MigrateMap.makeComputingMap(new Function<InstanceMode, InstanceConfigMonitor>() {
public InstanceConfigMonitor apply(InstanceMode mode) { public InstanceConfigMonitor apply(InstanceMode mode) {
int scanInterval = Integer int scanInterval = Integer.valueOf(getProperty(properties, CanalConstants.CANAL_AUTO_SCAN_INTERVAL));
.valueOf(getProperty(properties, CanalConstants.CANAL_AUTO_SCAN_INTERVAL));
if (mode.isSpring()) { if (mode.isSpring()) {
SpringInstanceConfigMonitor monitor = new SpringInstanceConfigMonitor(); SpringInstanceConfigMonitor monitor = new SpringInstanceConfigMonitor();
@@ -375,8 +383,7 @@ public class CanalController {
InstanceConfig oldConfig = instanceConfigs.put(destination, config); InstanceConfig oldConfig = instanceConfigs.put(destination, config);
if (oldConfig != null) { if (oldConfig != null) {
logger logger.warn("destination:{} old config:{} has replace by new config:{}", destination, oldConfig, config);
.warn("destination:{} old config:{} has replace by new config:{}", destination, oldConfig, config);
} }
} }
} }
@@ -424,9 +431,9 @@ public class CanalController {
} }
public void start() throws Throwable { public void start() throws Throwable {
logger.info("## start the canal server[{}:{}]", ip, port); logger.info("## start the canal server[{}({}):{}]", ip, registerIp, port);
// 创建整个canal的工作节点 // 创建整个canal的工作节点
final String path = ZookeeperPathUtils.getCanalClusterNode(ip + ":" + port); final String path = ZookeeperPathUtils.getCanalClusterNode(registerIp + ":" + port);
initCid(path); initCid(path);
if (zkclientx != null) { if (zkclientx != null) {
this.zkclientx.subscribeStateChanges(new IZkStateListener() { this.zkclientx.subscribeStateChanges(new IZkStateListener() {
@@ -501,14 +508,14 @@ public class CanalController {
} }
// 释放canal的工作节点 // 释放canal的工作节点
releaseCid(ZookeeperPathUtils.getCanalClusterNode(ip + ":" + port)); releaseCid(ZookeeperPathUtils.getCanalClusterNode(registerIp + ":" + port));
logger.info("## stop the canal server[{}:{}]", ip, port); logger.info("## stop the canal server[{}({}):{}]", ip, registerIp, port);
if (zkclientx != null) { if (zkclientx != null) {
zkclientx.close(); zkclientx.close();
} }
//关闭时清理缓存 // 关闭时清理缓存
if (instanceConfigs != null) { if (instanceConfigs != null) {
instanceConfigs.clear(); instanceConfigs.clear();
} }

15
deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalLauncher.java
View File

@@ -4,16 +4,16 @@ import java.io.FileInputStream;
import java.util.Properties; import java.util.Properties;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import com.alibaba.otter.canal.deployer.mbean.CanalServerAgent;
import com.alibaba.otter.canal.deployer.mbean.CanalServerMXBean;
import com.alibaba.otter.canal.deployer.mbean.CanalServerBean;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.alibaba.otter.canal.deployer.mbean.CanalServerAgent;
import com.alibaba.otter.canal.deployer.mbean.CanalServerBean;
import com.alibaba.otter.canal.deployer.mbean.CanalServerMXBean;
import com.alibaba.otter.canal.deployer.monitor.remote.RemoteCanalConfigMonitor;
import com.alibaba.otter.canal.deployer.monitor.remote.RemoteConfigLoader; import com.alibaba.otter.canal.deployer.monitor.remote.RemoteConfigLoader;
import com.alibaba.otter.canal.deployer.monitor.remote.RemoteConfigLoaderFactory; import com.alibaba.otter.canal.deployer.monitor.remote.RemoteConfigLoaderFactory;
import com.alibaba.otter.canal.deployer.monitor.remote.RemoteCanalConfigMonitor;
/** /**
* canal独立版本启动的入口类 * canal独立版本启动的入口类
@@ -80,8 +80,13 @@ public class CanalLauncher {
String jmxPort = properties.getProperty(CanalConstants.CANAL_ADMIN_JMX_PORT); String jmxPort = properties.getProperty(CanalConstants.CANAL_ADMIN_JMX_PORT);
if (StringUtils.isNotEmpty(jmxPort)) { if (StringUtils.isNotEmpty(jmxPort)) {
String ip = properties.getProperty(CanalConstants.CANAL_IP); String ip = properties.getProperty(CanalConstants.CANAL_IP);
String registerIp = properties.getProperty(CanalConstants.CANAL_REGISTER_IP);
if (StringUtils.isEmpty(registerIp)) {
// 兼容老的配置
registerIp = ip;
}
CanalServerMXBean canalServerMBean = new CanalServerBean(canalStater); CanalServerMXBean canalServerMBean = new CanalServerBean(canalStater);
canalServerAgent = new CanalServerAgent(ip, Integer.parseInt(jmxPort), canalServerMBean); canalServerAgent = new CanalServerAgent(registerIp, Integer.parseInt(jmxPort), canalServerMBean);
Thread agentThread = new Thread(canalServerAgent::start); Thread agentThread = new Thread(canalServerAgent::start);
agentThread.start(); agentThread.start();
} }

3
deployer/src/main/resources/canal.properties
View File

@@ -5,7 +5,10 @@
#canal.manager.jdbc.username=root #canal.manager.jdbc.username=root
#canal.manager.jdbc.password=121212 #canal.manager.jdbc.password=121212
canal.id = 1 canal.id = 1
# tcp bind ip
canal.ip = canal.ip =
# register ip to zookeeper
canal.register.ip =
canal.port = 11111 canal.port = 11111
canal.metrics.pull.port = 11112 canal.metrics.pull.port = 11112
canal.admin.jmx.port = 11113 canal.admin.jmx.port = 11113