From f7bf4ac6ff260377d7879a6fc1e05c596737827b Mon Sep 17 00:00:00 2001 From: agapple Date: Sun, 25 Nov 2018 18:33:34 +0800 Subject: [PATCH] fixed log test --- .../parse/inbound/mysql/AbstractMysqlEventParser.java | 4 ---- .../otter/canal/parse/DirectLogFetcherTest.java | 10 ++++++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/AbstractMysqlEventParser.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/AbstractMysqlEventParser.java index 5e94e40b..af792ec8 100644 --- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/AbstractMysqlEventParser.java +++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/AbstractMysqlEventParser.java @@ -3,9 +3,6 @@ package com.alibaba.otter.canal.parse.inbound.mysql; import java.nio.charset.Charset; import java.util.concurrent.atomic.AtomicLong; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.alibaba.otter.canal.filter.CanalEventFilter; import com.alibaba.otter.canal.filter.aviater.AviaterRegexFilter; import com.alibaba.otter.canal.parse.CanalEventParser; @@ -21,7 +18,6 @@ import com.alibaba.otter.canal.protocol.position.EntryPosition; public abstract class AbstractMysqlEventParser extends AbstractEventParser { - protected final Logger logger = LoggerFactory.getLogger(this.getClass()); protected static final long BINLOG_START_OFFEST = 4L; protected TableMetaTSDBFactory tableMetaTSDBFactory = new DefaultTableMetaTSDBFactory(); diff --git a/parse/src/test/java/com/alibaba/otter/canal/parse/DirectLogFetcherTest.java b/parse/src/test/java/com/alibaba/otter/canal/parse/DirectLogFetcherTest.java index 719e86dd..089163d3 100644 --- a/parse/src/test/java/com/alibaba/otter/canal/parse/DirectLogFetcherTest.java +++ b/parse/src/test/java/com/alibaba/otter/canal/parse/DirectLogFetcherTest.java @@ -1,5 +1,7 @@ package com.alibaba.otter.canal.parse; +import static com.alibaba.otter.canal.parse.inbound.mysql.dbsync.DirectLogFetcher.MASTER_HEARTBEAT_PERIOD_SECONDS; + import java.io.IOException; import java.io.Serializable; import java.io.UnsupportedEncodingException; @@ -7,6 +9,7 @@ import java.net.InetSocketAddress; import java.nio.charset.Charset; import java.util.BitSet; import java.util.List; +import java.util.concurrent.TimeUnit; import org.apache.commons.lang.StringUtils; import org.junit.Assert; @@ -213,6 +216,13 @@ public class DirectLogFetcherTest { } catch (Exception e) { logger.warn("update mariadb_slave_capability failed", e); } + + try { + long period = TimeUnit.SECONDS.toNanos(MASTER_HEARTBEAT_PERIOD_SECONDS); + update("SET @master_heartbeat_period=" + period, connector); + } catch (Exception e) { + logger.warn("update master_heartbeat_period failed", e); + } } private void loadBinlogChecksum(MysqlConnector connector) { -- GitLab