Commit Graph
545 Commits
Author SHA1 Message Date
XiaoFu 847634a0f2 Merge pull request #1 from alibaba/master
pull a request
2018-09-11 17:13:48 +08:00
agapple bc8f201b21 Merge pull request #927 from rewerma/master
fix #912 解决guava冲突问题
2018-09-11 12:31:24 +08:00
mcy e450c3f83f fix #912 通过maven插件将guava修改包路径打包进canal.client 2018-09-11 11:35:47 +08:00
rewerma 32910b5983 Merge pull request #5 from alibaba/master
merge from alibaba/canal
2018-09-11 02:19:20 +08:00
WithLin a497962153 Fix upgrade protobuf version 2018-09-07 14:27:19 +08:00
七锋 82f8a9fc98 fixed issue #483 , show slave hosts canal-1.1.1-preview-1 2018-09-04 12:55:16 +08:00
七锋 f5bf1667a9 fixed mq and client launcher 2018-09-04 12:35:20 +08:00
七锋 a9cccb3017 fixed format 2018-09-04 11:39:23 +08:00
七锋 47ac10ca18 fixed issue #868 , NPE fixed 2018-09-04 11:28:56 +08:00
agapple d4a70d5eea Merge pull request #900 from rewerma/master
kafka server端代码调整
2018-09-04 10:55:04 +08:00
agapple e78de8568e Merge pull request #902 from wingerx/master
fix bug #890: 并行解析 + Gtid .没有初始化LogContext中的gtidSet
2018-09-04 10:53:07 +08:00
mcy 728550cac3 增加kafka producer send结果同步判断 2018-09-04 09:56:51 +08:00
mcy 81c216f1c1 增加kafka get的超时时间 2018-09-04 09:39:02 +08:00
mcy 17f345bfe5 0.11的环境未测过,先去除kafka的事务 2018-09-03 18:07:43 +08:00
mcy ebf9139762 增加kafka producer sender的callback,canal和kafka同步提交回滚
去除一个canal实例对应多个kafka topic的机制,一个实例只对应一个topic
kafka模式下server端的批次大小不能超过1M,最大为900K
2018-09-03 17:40:30 +08:00
winger 7de40091a3 fix bug #890 2018-09-03 15:28:15 +08:00
machey ee5775ce05 去掉kafka server端TRANSACTIONBEGIN和TRANSACTIONEND的判断 2018-09-02 20:21:07 +08:00
agapple 21ef2e5dd4 Merge pull request #896 from lcybo/master
修复execTime快于canal当前时间,delay无data points
2018-08-31 13:59:57 +08:00
agapple 283956ee93 Merge pull request #894 from zhangxin1988/master
fix #893 index name contains "on" keyword
2018-08-31 13:59:29 +08:00
Chuanyi Li 06275a46ed Fix no data points while execTime exceeding current time of canal server. 2018-08-29 19:52:09 +08:00
张鑫 ea81b1dc92 fix #893 index name contains "on" keyword 2018-08-29 14:37:27 +08:00
agapple fd5cfe23db Merge pull request #892 from rewerma/master
kafka client keep alive间隔时间
2018-08-28 17:47:31 +08:00
mcy bcf30a9a05 去掉kafka canalBatchSize使用默认50 2018-08-28 15:52:36 +08:00
mcy d5122dcf50 Merge branch 'master' of https://github.com/alibaba/canal 2018-08-28 15:49:27 +08:00
mcy b5e05c8c77 kafka client keep alive间隔时间 2018-08-28 13:51:23 +08:00
agapple 9434ed513e Merge pull request #881 from wingerx/master
fix bug: 并行解析模式下,开启gtid 会导致解析错误
2018-08-26 22:00:59 +08:00
winger 6fe3ef43d8 fix bug: 并行解析模式下,开启gtid 会导致解析错误 2018-08-25 09:17:13 +08:00
winger c1f92858a2 fix bug: 并行解析模式下,开启gtid 会导致解析错误 2018-08-25 03:54:38 +08:00
agapple 00b5ade787 Merge pull request #876 from rewerma/master
整合 kafka 到 server 和 client
2018-08-24 12:05:07 +08:00
mcy 6b94f396ff 移除kafka client基于zk的HA机制 2018-08-24 10:52:04 +08:00
mcy b7de1e5070 删除kafka kafka-client模块 2018-08-24 09:14:52 +08:00
machey 4fe6c36c49 Merge branch 'develop-tmp'
# Conflicts:
#	kafka-client/pom.xml
#	kafka/pom.xml
2018-08-23 23:59:20 +08:00
agapple 899592ce2a Merge pull request #873 from lcybo/master
单核环境下创建线程池会出错。
2018-08-23 19:17:47 +08:00
Chuanyi Li L 8585761f42 Merge branch 'master' of https://github.com/lcybo/canal 2018-08-23 17:52:23 +08:00
Chuanyi Li L 1aa2e1a409 Ensure at least 1 thread for thread pool. 2018-08-23 17:51:25 +08:00
mcy 9e3d4a7ffe HBase读配置空行的bug 2018-08-23 17:43:53 +08:00
mcy fc3de4b7fd 整合canal.client和canal.kafka-client 2018-08-23 17:38:17 +08:00
mcy e7f07d7d3e 整合canal.server和canal.kafka 2018-08-23 17:33:15 +08:00
七锋 6e07021223 fixed client version 1.1.1-SNAPSHOT 2018-08-23 14:27:16 +08:00
agapple 3c80b6c1f7 Merge pull request #865 from rewerma/master
fix #849: HBase数据同步适配
2018-08-23 13:58:23 +08:00
mcy 20b0b39b14 fix #849: hbase数据同步适配 2018-08-23 12:02:44 +08:00
lcybo de59d22429 Merge pull request #861 from Lee-Think/master
Client QPS指标的datasource配置项由"Prometheus"改为取$datasource参数
2018-08-21 18:59:36 +08:00
lixiang 1bef1b72bc Client QPS指标的datasource配置项由"Prometheus"改为取$datasource参数 2018-08-21 17:20:00 +08:00
mcy 47348e2e96 新增client-launcher模块,外部数据落地适配器的总入口 2018-08-20 18:22:11 +08:00
七锋 0f3c427e28 fixed docker run 2018-08-20 14:28:12 +08:00
七锋 9bde69b6d6 [maven-release-plugin] prepare for next development iteration 2018-08-20 13:29:12 +08:00
七锋 dd8b1ce955 [maven-release-plugin] prepare release canal-1.1.0 canal-1.1.0 2018-08-20 13:28:57 +08:00
七锋 cb884094d5 fixed metrics 2018-08-20 13:01:22 +08:00
agapple f567abdaee Merge pull request #855 from lcybo/master
Remove TPS(events) in tmpl.
2018-08-20 10:16:03 +08:00
Chuanyi Li 02757693b4 Remove TPS(events) in tmpl. 2018-08-20 08:02:20 +08:00