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

destory TableMetaTSDB when stop EventParser

Browse Source
This commit is contained in:
wuwo
2018-11-05 16:22:15 +08:00
parent 6ff57f53f8
commit beed10901d
7 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deployer/src/main/resources/spring/tsdb/h2-tsdb.xml
View File

@@ -23,7 +23,7 @@
</bean> </bean>
<!-- 基于db的实现 --> <!-- 基于db的实现 -->
<bean id="tableMetaTSDB" class="com.alibaba.otter.canal.parse.inbound.mysql.tsdb.DatabaseTableMeta"> <bean id="tableMetaTSDB" class="com.alibaba.otter.canal.parse.inbound.mysql.tsdb.DatabaseTableMeta" destroy-method="destory">
<property name="metaHistoryDAO" ref="metaHistoryDAO"/> <property name="metaHistoryDAO" ref="metaHistoryDAO"/>
<property name="metaSnapshotDAO" ref="metaSnapshotDAO"/> <property name="metaSnapshotDAO" ref="metaSnapshotDAO"/>
</bean> </bean>

2
deployer/src/main/resources/spring/tsdb/mysql-tsdb.xml
View File

@@ -23,7 +23,7 @@
</bean> </bean>
<!-- 基于db的实现 --> <!-- 基于db的实现 -->
<bean id="tableMetaTSDB" class="com.alibaba.otter.canal.parse.inbound.mysql.tsdb.DatabaseTableMeta"> <bean id="tableMetaTSDB" class="com.alibaba.otter.canal.parse.inbound.mysql.tsdb.DatabaseTableMeta" destroy-method="destory">
<property name="metaHistoryDAO" ref="metaHistoryDAO"/> <property name="metaHistoryDAO" ref="metaHistoryDAO"/>
<property name="metaSnapshotDAO" ref="metaSnapshotDAO"/> <property name="metaSnapshotDAO" ref="metaSnapshotDAO"/>
</bean> </bean>

22
parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/DatabaseTableMeta.java
View File

@@ -72,7 +72,7 @@ public class DatabaseTableMeta implements TableMetaTSDB {
@Override @Override
public Thread newThread(Runnable r) { public Thread newThread(Runnable r) {
Thread thread = new Thread(r, "[scheduler-table-meta-snapshot]"); Thread thread = new Thread(r, String.format("[scheduler-table-meta-snapshot-%s]", destination));
thread.setDaemon(true); thread.setDaemon(true);
return thread; return thread;
} }
@@ -105,6 +105,26 @@ public class DatabaseTableMeta implements TableMetaTSDB {
} }
return true; return true;
} }
@Override
public void destory() {
if (memoryTableMeta != null) {
memoryTableMeta.destory();
}
if (connection != null) {
try {
connection.disconnect();
} catch (IOException e) {
logger.error("ERROR # disconnect meta connection for address:{}", connection.getConnector()
.getAddress(), e);
}
}
if (scheduler != null) {
scheduler.shutdown();
}
}
@Override @Override
public TableMeta find(String schema, String table) { public TableMeta find(String schema, String table) {

5
parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/MemoryTableMeta.java
View File

@@ -58,6 +58,11 @@ public class MemoryTableMeta implements TableMetaTSDB {
public boolean init(String destination) { public boolean init(String destination) {
return true; return true;
} }
@Override
public void destory() {
tableMetas.clear();
}
public boolean apply(EntryPosition position, String schema, String ddl, String extra) { public boolean apply(EntryPosition position, String schema, String ddl, String extra) {
tableMetas.clear(); tableMetas.clear();

5
parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/TableMetaTSDB.java
View File

@@ -18,6 +18,11 @@ public interface TableMetaTSDB {
*/ */
public boolean init(String destination); public boolean init(String destination);
/**
* 销毁资源
*/
public void destory();
/** /**
* 获取当前的表结构 * 获取当前的表结构
*/ */

2
parse/src/test/resources/tsdb/h2-tsdb.xml
View File

@@ -7,7 +7,7 @@
default-autowire="byName"> default-autowire="byName">
<!-- 基于db的实现 --> <!-- 基于db的实现 -->
<bean id="tableMetaTSDB" class="com.alibaba.otter.canal.parse.inbound.mysql.tsdb.DatabaseTableMeta"> <bean id="tableMetaTSDB" class="com.alibaba.otter.canal.parse.inbound.mysql.tsdb.DatabaseTableMeta" destroy-method="destory">
<property name="metaHistoryDAO" ref="metaHistoryDAO"/> <property name="metaHistoryDAO" ref="metaHistoryDAO"/>
<property name="metaSnapshotDAO" ref="metaSnapshotDAO"/> <property name="metaSnapshotDAO" ref="metaSnapshotDAO"/>
</bean> </bean>

2
parse/src/test/resources/tsdb/mysql-tsdb.xml
View File

@@ -7,7 +7,7 @@
default-autowire="byName"> default-autowire="byName">
<!-- 基于db的实现 --> <!-- 基于db的实现 -->
<bean id="tableMetaTSDB" class="com.alibaba.otter.canal.parse.inbound.mysql.tsdb.DatabaseTableMeta"> <bean id="tableMetaTSDB" class="com.alibaba.otter.canal.parse.inbound.mysql.tsdb.DatabaseTableMeta" destroy-method="destory">
<property name="metaHistoryDAO" ref="metaHistoryDAO"/> <property name="metaHistoryDAO" ref="metaHistoryDAO"/>
<property name="metaSnapshotDAO" ref="metaSnapshotDAO"/> <property name="metaSnapshotDAO" ref="metaSnapshotDAO"/>
</bean> </bean>