Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lijianghuflute
canal
提交
07b979f2
canal
项目概览
lijianghuflute
/
canal
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
canal
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
07b979f2
编写于
4月 08, 2017
作者:
A
agapple
提交者:
GitHub
4月 08, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #293 from MarkLinHz/master
fix bug of repeat log manager
上级
fdd40224
6b20959a
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
20 addition
and
24 deletion
+20
-24
deployer/src/main/resources/logback.xml
deployer/src/main/resources/logback.xml
+2
-4
parse/src/main/java/com/alibaba/otter/canal/parse/index/FailbackLogPositionManager.java
...a/otter/canal/parse/index/FailbackLogPositionManager.java
+1
-1
parse/src/main/java/com/alibaba/otter/canal/parse/index/MixedLogPositionManager.java
...baba/otter/canal/parse/index/MixedLogPositionManager.java
+7
-2
parse/src/test/java/com/alibaba/otter/canal/parse/index/MetaLogPositionManagerTest.java
...a/otter/canal/parse/index/MetaLogPositionManagerTest.java
+1
-2
parse/src/test/java/com/alibaba/otter/canal/parse/index/MixedLogPositionManagerTest.java
.../otter/canal/parse/index/MixedLogPositionManagerTest.java
+4
-7
parse/src/test/java/com/alibaba/otter/canal/parse/index/PeriodMixedLogPositionManagerTest.java
.../canal/parse/index/PeriodMixedLogPositionManagerTest.java
+4
-6
parse/src/test/java/com/alibaba/otter/canal/parse/index/ZooKeeperLogPositionManagerTest.java
...er/canal/parse/index/ZooKeeperLogPositionManagerTest.java
+1
-2
未找到文件。
deployer/src/main/resources/logback.xml
浏览文件 @
07b979f2
...
@@ -74,10 +74,8 @@
...
@@ -74,10 +74,8 @@
<appender-ref
ref=
"CANAL-META"
/>
<appender-ref
ref=
"CANAL-META"
/>
</logger>
</logger>
<root
level=
"WARN"
>
<root
level=
"INFO"
>
<!--
<!--<appender-ref ref="STDOUT"/>-->
<appender-ref ref="STDOUT"/>
-->
<appender-ref
ref=
"CANAL-ROOT"
/>
<appender-ref
ref=
"CANAL-ROOT"
/>
</root>
</root>
</configuration>
</configuration>
\ No newline at end of file
parse/src/main/java/com/alibaba/otter/canal/parse/index/FailbackLogPositionManager.java
浏览文件 @
07b979f2
...
@@ -42,7 +42,7 @@ public class FailbackLogPositionManager extends AbstractLogPositionManager {
...
@@ -42,7 +42,7 @@ public class FailbackLogPositionManager extends AbstractLogPositionManager {
}
}
if
(!
secondary
.
isStart
())
{
if
(!
secondary
.
isStart
())
{
prim
ary
.
start
();
second
ary
.
start
();
}
}
}
}
...
...
parse/src/main/java/com/alibaba/otter/canal/parse/index/MixedLogPositionManager.java
浏览文件 @
07b979f2
...
@@ -38,8 +38,13 @@ public class MixedLogPositionManager extends AbstractLogPositionManager {
...
@@ -38,8 +38,13 @@ public class MixedLogPositionManager extends AbstractLogPositionManager {
public
void
start
()
{
public
void
start
()
{
super
.
start
();
super
.
start
();
memoryLogPositionManager
.
start
();
if
(!
memoryLogPositionManager
.
isStart
())
{
zooKeeperLogPositionManager
.
start
();
memoryLogPositionManager
.
start
();
}
if
(!
zooKeeperLogPositionManager
.
isStart
())
{
zooKeeperLogPositionManager
.
start
();
}
}
}
@Override
@Override
...
...
parse/src/test/java/com/alibaba/otter/canal/parse/index/MetaLogPositionManagerTest.java
浏览文件 @
07b979f2
...
@@ -45,8 +45,7 @@ public class MetaLogPositionManagerTest extends AbstractLogPositionManagerTest {
...
@@ -45,8 +45,7 @@ public class MetaLogPositionManagerTest extends AbstractLogPositionManagerTest {
metaManager
.
setZooKeeperMetaManager
(
zooKeeperMetaManager
);
metaManager
.
setZooKeeperMetaManager
(
zooKeeperMetaManager
);
metaManager
.
start
();
metaManager
.
start
();
MetaLogPositionManager
logPositionManager
=
new
MetaLogPositionManager
();
MetaLogPositionManager
logPositionManager
=
new
MetaLogPositionManager
(
metaManager
);
logPositionManager
.
setMetaManager
(
metaManager
);
logPositionManager
.
start
();
logPositionManager
.
start
();
// 构建meta信息
// 构建meta信息
ClientIdentity
client1
=
new
ClientIdentity
(
destination
,
(
short
)
1
);
ClientIdentity
client1
=
new
ClientIdentity
(
destination
,
(
short
)
1
);
...
...
parse/src/test/java/com/alibaba/otter/canal/parse/index/MixedLogPositionManagerTest.java
浏览文件 @
07b979f2
...
@@ -27,19 +27,16 @@ public class MixedLogPositionManagerTest extends AbstractLogPositionManagerTest
...
@@ -27,19 +27,16 @@ public class MixedLogPositionManagerTest extends AbstractLogPositionManagerTest
@Test
@Test
public
void
testAll
()
{
public
void
testAll
()
{
MixedLogPositionManager
logPositionManager
=
new
MixedLogPositionManager
();
MemoryLogPositionManager
memoryLogPositionManager
=
new
MemoryLogPositionManager
();
ZooKeeperLogPositionManager
zookeeperLogPositionManager
=
new
ZooKeeperLogPositionManager
(
zkclientx
);
ZooKeeperLogPositionManager
zookeeperLogPositionManager
=
new
ZooKeeperLogPositionManager
();
MixedLogPositionManager
logPositionManager
=
new
MixedLogPositionManager
(
zkclientx
);
zookeeperLogPositionManager
.
setZkClientx
(
zkclientx
);
logPositionManager
.
setZooKeeperLogPositionManager
(
zookeeperLogPositionManager
);
logPositionManager
.
start
();
logPositionManager
.
start
();
LogPosition
position2
=
doTest
(
logPositionManager
);
LogPosition
position2
=
doTest
(
logPositionManager
);
sleep
(
1000
);
sleep
(
1000
);
MixedLogPositionManager
logPositionManager2
=
new
MixedLogPositionManager
();
MixedLogPositionManager
logPositionManager2
=
new
MixedLogPositionManager
(
zkclientx
);
logPositionManager2
.
setZooKeeperLogPositionManager
(
zookeeperLogPositionManager
);
logPositionManager2
.
start
();
logPositionManager2
.
start
();
LogPosition
getPosition2
=
logPositionManager2
.
getLatestIndexBy
(
destination
);
LogPosition
getPosition2
=
logPositionManager2
.
getLatestIndexBy
(
destination
);
...
...
parse/src/test/java/com/alibaba/otter/canal/parse/index/PeriodMixedLogPositionManagerTest.java
浏览文件 @
07b979f2
...
@@ -27,19 +27,17 @@ public class PeriodMixedLogPositionManagerTest extends AbstractLogPositionManage
...
@@ -27,19 +27,17 @@ public class PeriodMixedLogPositionManagerTest extends AbstractLogPositionManage
@Test
@Test
public
void
testAll
()
{
public
void
testAll
()
{
PeriodMixedLogPositionManager
logPositionManager
=
new
PeriodMixedLogPositionManager
();
MemoryLogPositionManager
memoryLogPositionManager
=
new
MemoryLogPositionManager
();
ZooKeeperLogPositionManager
zookeeperLogPositionManager
=
new
ZooKeeperLogPositionManager
(
zkclientx
);
ZooKeeperLogPositionManager
zookeeperLogPositionManager
=
new
ZooKeeperLogPositionManager
();
PeriodMixedLogPositionManager
logPositionManager
=
new
PeriodMixedLogPositionManager
(
memoryLogPositionManager
,
zookeeperLogPositionManager
,
1000L
);
zookeeperLogPositionManager
.
setZkClientx
(
zkclientx
);
logPositionManager
.
setZooKeeperLogPositionManager
(
zookeeperLogPositionManager
);
logPositionManager
.
start
();
logPositionManager
.
start
();
LogPosition
position2
=
doTest
(
logPositionManager
);
LogPosition
position2
=
doTest
(
logPositionManager
);
sleep
(
1500
);
sleep
(
1500
);
PeriodMixedLogPositionManager
logPositionManager2
=
new
PeriodMixedLogPositionManager
();
PeriodMixedLogPositionManager
logPositionManager2
=
new
PeriodMixedLogPositionManager
(
memoryLogPositionManager
,
zookeeperLogPositionManager
,
1000L
);
logPositionManager2
.
setZooKeeperLogPositionManager
(
zookeeperLogPositionManager
);
logPositionManager2
.
start
();
logPositionManager2
.
start
();
LogPosition
getPosition2
=
logPositionManager2
.
getLatestIndexBy
(
destination
);
LogPosition
getPosition2
=
logPositionManager2
.
getLatestIndexBy
(
destination
);
...
...
parse/src/test/java/com/alibaba/otter/canal/parse/index/ZooKeeperLogPositionManagerTest.java
浏览文件 @
07b979f2
...
@@ -25,8 +25,7 @@ public class ZooKeeperLogPositionManagerTest extends AbstractLogPositionManagerT
...
@@ -25,8 +25,7 @@ public class ZooKeeperLogPositionManagerTest extends AbstractLogPositionManagerT
@Test
@Test
public
void
testAll
()
{
public
void
testAll
()
{
ZooKeeperLogPositionManager
logPositionManager
=
new
ZooKeeperLogPositionManager
();
ZooKeeperLogPositionManager
logPositionManager
=
new
ZooKeeperLogPositionManager
(
zkclientx
);
logPositionManager
.
setZkClientx
(
zkclientx
);
logPositionManager
.
start
();
logPositionManager
.
start
();
doTest
(
logPositionManager
);
doTest
(
logPositionManager
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录