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

自动注册时可自定义node server名称，canal.properties#canal.admin.register.name，为空则使用canal.register.ip (#3459)

Browse Source
This commit is contained in:
zoemak
2021-04-19 10:18:01 +08:00
committed by GitHub
parent f0417502f8
commit 17f4ee13e7
8 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/controller/PollingConfigController.java
View File

@@ -46,14 +46,15 @@ public class PollingConfigController {
public BaseModel<CanalConfig> canalConfigPoll(@RequestHeader String user, @RequestHeader String passwd, public BaseModel<CanalConfig> canalConfigPoll(@RequestHeader String user, @RequestHeader String passwd,
@RequestParam String ip, @RequestParam Integer port, @RequestParam String ip, @RequestParam Integer port,
@RequestParam String md5, @RequestParam boolean register, @RequestParam String md5, @RequestParam boolean register,
@RequestParam String cluster, @PathVariable String env) { @RequestParam String cluster, @RequestParam String name,
@PathVariable String env) {
if (!auth(user, passwd)) { if (!auth(user, passwd)) {
throw new RuntimeException("auth :" + user + " is failed"); throw new RuntimeException("auth :" + user + " is failed");
} }
if (StringUtils.isEmpty(md5) && register) { if (StringUtils.isEmpty(md5) && register) {
// do something // do something
pollingConfigService.autoRegister(ip, port, cluster); pollingConfigService.autoRegister(ip, port, cluster, StringUtils.trimToNull(name));
} }
CanalConfig canalConfig = pollingConfigService.getChangedConfig(ip, port, md5); CanalConfig canalConfig = pollingConfigService.getChangedConfig(ip, port, md5);

2
admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/service/PollingConfigService.java
View File

@@ -5,7 +5,7 @@ import com.alibaba.otter.canal.admin.model.CanalInstanceConfig;
public interface PollingConfigService { public interface PollingConfigService {
public boolean autoRegister(String ip, Integer adminPort, String cluster); public boolean autoRegister(String ip, Integer adminPort, String cluster, String name);
CanalConfig getChangedConfig(String ip, Integer port, String md5); CanalConfig getChangedConfig(String ip, Integer port, String md5);

5
admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/service/impl/PollingConfigServiceImpl.java
View File

@@ -2,6 +2,7 @@ package com.alibaba.otter.canal.admin.service.impl;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.List; import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
@@ -28,11 +29,11 @@ public class PollingConfigServiceImpl implements PollingConfigService {
@Autowired @Autowired
CanalClusterService canalClusterService; CanalClusterService canalClusterService;
public boolean autoRegister(String ip, Integer adminPort, String cluster) { public boolean autoRegister(String ip, Integer adminPort, String cluster, String name) {
NodeServer server = NodeServer.find.query().where().eq("ip", ip).eq("adminPort", adminPort).findOne(); NodeServer server = NodeServer.find.query().where().eq("ip", ip).eq("adminPort", adminPort).findOne();
if (server == null) { if (server == null) {
server = new NodeServer(); server = new NodeServer();
server.setName(ip); server.setName(Optional.ofNullable(name).orElse(ip));
server.setIp(ip); server.setIp(ip);
server.setAdminPort(adminPort); server.setAdminPort(adminPort);
server.setTcpPort(adminPort + 1); server.setTcpPort(adminPort + 1);

4
admin/admin-web/src/main/resources/canal-template.properties
View File

@@ -16,6 +16,10 @@ canal.metrics.pull.port = 11112
canal.admin.port = 11110 canal.admin.port = 11110
canal.admin.user = admin canal.admin.user = admin
canal.admin.passwd = 4ACFE3202A5FF5CF467898FC58AAB1D615029441 canal.admin.passwd = 4ACFE3202A5FF5CF467898FC58AAB1D615029441
# admin auto register
#canal.admin.register.auto = true
#canal.admin.register.cluster =
#canal.admin.register.name =
canal.zkServers = canal.zkServers =
# flush data to zk # flush data to zk

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

@@ -25,6 +25,7 @@ public class CanalConstants {
public static final String CANAL_ADMIN_PASSWD = ROOT + "." + "admin.passwd"; public static final String CANAL_ADMIN_PASSWD = ROOT + "." + "admin.passwd";
public static final String CANAL_ADMIN_AUTO_REGISTER = ROOT + "." + "admin.register.auto"; public static final String CANAL_ADMIN_AUTO_REGISTER = ROOT + "." + "admin.register.auto";
public static final String CANAL_ADMIN_AUTO_CLUSTER = ROOT + "." + "admin.register.cluster"; public static final String CANAL_ADMIN_AUTO_CLUSTER = ROOT + "." + "admin.register.cluster";
public static final String CANAL_ADMIN_REGISTER_NAME = ROOT + "." + "admin.register.name";
public static final String CANAL_ZKSERVERS = ROOT + "." + "zkServers"; public static final String CANAL_ZKSERVERS = ROOT + "." + "zkServers";
public static final String CANAL_WITHOUT_NETTY = ROOT + "." + "withoutNetty"; public static final String CANAL_WITHOUT_NETTY = ROOT + "." + "withoutNetty";

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

@@ -55,6 +55,7 @@ public class CanalLauncher {
boolean autoRegister = BooleanUtils.toBoolean(CanalController.getProperty(properties, boolean autoRegister = BooleanUtils.toBoolean(CanalController.getProperty(properties,
CanalConstants.CANAL_ADMIN_AUTO_REGISTER)); CanalConstants.CANAL_ADMIN_AUTO_REGISTER));
String autoCluster = CanalController.getProperty(properties, CanalConstants.CANAL_ADMIN_AUTO_CLUSTER); String autoCluster = CanalController.getProperty(properties, CanalConstants.CANAL_ADMIN_AUTO_CLUSTER);
String name = CanalController.getProperty(properties, CanalConstants.CANAL_ADMIN_REGISTER_NAME);
String registerIp = CanalController.getProperty(properties, CanalConstants.CANAL_REGISTER_IP); String registerIp = CanalController.getProperty(properties, CanalConstants.CANAL_REGISTER_IP);
if (StringUtils.isEmpty(registerIp)) { if (StringUtils.isEmpty(registerIp)) {
registerIp = AddressUtils.getHostIp(); registerIp = AddressUtils.getHostIp();
@@ -65,7 +66,8 @@ public class CanalLauncher {
registerIp, registerIp,
Integer.parseInt(adminPort), Integer.parseInt(adminPort),
autoRegister, autoRegister,
autoCluster); autoCluster,
name);
PlainCanal canalConfig = configClient.findServer(null); PlainCanal canalConfig = configClient.findServer(null);
if (canalConfig == null) { if (canalConfig == null) {
throw new IllegalArgumentException("managerAddress:" + managerAddress throw new IllegalArgumentException("managerAddress:" + managerAddress

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

@@ -8,4 +8,5 @@ canal.admin.user = admin
canal.admin.passwd = 4ACFE3202A5FF5CF467898FC58AAB1D615029441 canal.admin.passwd = 4ACFE3202A5FF5CF467898FC58AAB1D615029441
# admin auto register # admin auto register
canal.admin.register.auto = true canal.admin.register.auto = true
canal.admin.register.cluster = canal.admin.register.cluster =
canal.admin.register.name =

6
instance/manager/src/main/java/com/alibaba/otter/canal/instance/manager/plain/PlainCanalConfigClient.java
View File

@@ -35,12 +35,14 @@ public class PlainCanalConfigClient extends AbstractCanalLifeCycle implements Ca
private int adminPort; private int adminPort;
private boolean autoRegister; private boolean autoRegister;
private String autoCluster; private String autoCluster;
private String name;
public PlainCanalConfigClient(String configURL, String user, String passwd, String localIp, int adminPort, public PlainCanalConfigClient(String configURL, String user, String passwd, String localIp, int adminPort,
boolean autoRegister, String autoCluster){ boolean autoRegister, String autoCluster, String name){
this(configURL, user, passwd, localIp, adminPort); this(configURL, user, passwd, localIp, adminPort);
this.autoCluster = autoCluster; this.autoCluster = autoCluster;
this.autoRegister = autoRegister; this.autoRegister = autoRegister;
this.name = name;
} }
public PlainCanalConfigClient(String configURL, String user, String passwd, String localIp, int adminPort){ public PlainCanalConfigClient(String configURL, String user, String passwd, String localIp, int adminPort){
@@ -71,7 +73,7 @@ public class PlainCanalConfigClient extends AbstractCanalLifeCycle implements Ca
md5 = ""; md5 = "";
} }
String url = configURL + "/api/v1/config/server_polling?ip=" + localIp + "&port=" + adminPort + "&md5=" + md5 String url = configURL + "/api/v1/config/server_polling?ip=" + localIp + "&port=" + adminPort + "&md5=" + md5
+ "&register=" + (autoRegister ? 1 : 0) + "&cluster=" + autoCluster; + "&register=" + (autoRegister ? 1 : 0) + "&cluster=" + autoCluster + "&name=" + name;
return queryConfig(url); return queryConfig(url);
} }