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 #259 from GitHub-BruceTong/dev

Browse Source 
fix bug for #202（canal.instance.filter.regex 修改后未生效）
This commit is contained in:
agapple
2017-03-28 09:49:18 +08:00
committed by GitHub
parent 73627df082 03ff9512dd
commit e5444ae658
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
deployer/src/main/java/com/alibaba/otter/canal/deployer/monitor/SpringInstanceConfigMonitor.java
View File

@@ -49,6 +49,8 @@ public class SpringInstanceConfigMonitor extends AbstractCanalLifeCycle implemen
private ScheduledExecutorService executor = Executors.newScheduledThreadPool(1, private ScheduledExecutorService executor = Executors.newScheduledThreadPool(1,
new NamedThreadFactory("canal-instance-scan")); new NamedThreadFactory("canal-instance-scan"));
private volatile boolean isFirst = true;
public void start() { public void start() {
super.start(); super.start();
Assert.notNull(rootConf, "root conf dir is null!"); Assert.notNull(rootConf, "root conf dir is null!");
@@ -58,6 +60,7 @@ public class SpringInstanceConfigMonitor extends AbstractCanalLifeCycle implemen
public void run() { public void run() {
try { try {
scan(); scan();
if (isFirst) isFirst = false;
} catch (Throwable e) { } catch (Throwable e) {
logger.error("scan failed", e); logger.error("scan failed", e);
} }
@@ -122,13 +125,18 @@ public class SpringInstanceConfigMonitor extends AbstractCanalLifeCycle implemen
if (!actions.containsKey(destination) && instanceConfigs.length > 0) { if (!actions.containsKey(destination) && instanceConfigs.length > 0) {
// 存在合法的instance.properties，并且第一次添加时，进行启动操作 // 存在合法的instance.properties，并且第一次添加时，进行启动操作
notifyStart(instanceDir, destination); notifyStart(instanceDir, destination, instanceConfigs);
} else if (actions.containsKey(destination)) { } else if (actions.containsKey(destination)) {
// 历史已经启动过 // 历史已经启动过
if (instanceConfigs.length == 0) { // 如果不存在合法的instance.properties if (instanceConfigs.length == 0) { // 如果不存在合法的instance.properties
notifyStop(destination); notifyStop(destination);
} else { } else {
InstanceConfigFiles lastFile = lastFiles.get(destination); InstanceConfigFiles lastFile = lastFiles.get(destination);
// 历史启动过 所以配置文件信息必然存在
if (!isFirst && CollectionUtils.isEmpty(lastFile.getInstanceFiles())) {
logger.error("[{}] is started, but not found instance file info.", destination);
}
boolean hasChanged = judgeFileChanged(instanceConfigs, lastFile.getInstanceFiles()); boolean hasChanged = judgeFileChanged(instanceConfigs, lastFile.getInstanceFiles());
// 通知变化 // 通知变化
if (hasChanged) { if (hasChanged) {
@@ -161,10 +169,19 @@ public class SpringInstanceConfigMonitor extends AbstractCanalLifeCycle implemen
} }
} }
private void notifyStart(File instanceDir, String destination) { private void notifyStart(File instanceDir, String destination, File[] instanceConfigs) {
try { try {
defaultAction.start(destination); defaultAction.start(destination);
actions.put(destination, defaultAction); actions.put(destination, defaultAction);
// 启动成功后记录配置文件信息
InstanceConfigFiles lastFile = lastFiles.get(destination);
List<FileInfo> newFileInfo = new ArrayList<FileInfo>();
for (File instanceConfig : instanceConfigs) {
newFileInfo.add(new FileInfo(instanceConfig.getName(), instanceConfig.lastModified()));
}
lastFile.setInstanceFiles(newFileInfo);
logger.info("auto notify start {} successful.", destination); logger.info("auto notify start {} successful.", destination);
} catch (Throwable e) { } catch (Throwable e) {
logger.error("scan add found[{}] but start failed", destination, ExceptionUtils.getFullStackTrace(e)); logger.error("scan add found[{}] but start failed", destination, ExceptionUtils.getFullStackTrace(e));