Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Forever310
druid
提交
3dbf4757
D
druid
项目概览
Forever310
/
druid
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
druid
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3dbf4757
编写于
6月 17, 2014
作者:
F
fjy
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix linux test failures
上级
5227b430
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
32 addition
and
10 deletion
+32
-10
server/src/main/java/io/druid/server/bridge/DruidClusterBridge.java
.../main/java/io/druid/server/bridge/DruidClusterBridge.java
+1
-1
server/src/test/java/io/druid/server/bridge/DruidClusterBridgeTest.java
...t/java/io/druid/server/bridge/DruidClusterBridgeTest.java
+31
-9
未找到文件。
server/src/main/java/io/druid/server/bridge/DruidClusterBridge.java
浏览文件 @
3dbf4757
...
@@ -253,7 +253,7 @@ public class DruidClusterBridge
...
@@ -253,7 +253,7 @@ public class DruidClusterBridge
log
.
warn
(
e
,
"Unable to close leaderLatch, ignoring"
);
log
.
warn
(
e
,
"Unable to close leaderLatch, ignoring"
);
}
}
exec
.
shutdown
Now
();
exec
.
shutdown
();
started
=
false
;
started
=
false
;
}
}
...
...
server/src/test/java/io/druid/server/bridge/DruidClusterBridgeTest.java
浏览文件 @
3dbf4757
...
@@ -148,8 +148,12 @@ public class DruidClusterBridgeTest
...
@@ -148,8 +148,12 @@ public class DruidClusterBridgeTest
0
0
);
);
DbSegmentPublisher
dbSegmentPublisher
=
EasyMock
.
createMock
(
DbSegmentPublisher
.
class
);
DbSegmentPublisher
dbSegmentPublisher
=
EasyMock
.
createMock
(
DbSegmentPublisher
.
class
);
EasyMock
.
replay
(
dbSegmentPublisher
);
DatabaseSegmentManager
databaseSegmentManager
=
EasyMock
.
createMock
(
DatabaseSegmentManager
.
class
);
DatabaseSegmentManager
databaseSegmentManager
=
EasyMock
.
createMock
(
DatabaseSegmentManager
.
class
);
EasyMock
.
replay
(
databaseSegmentManager
);
ServerView
serverView
=
EasyMock
.
createMock
(
ServerView
.
class
);
ServerView
serverView
=
EasyMock
.
createMock
(
ServerView
.
class
);
EasyMock
.
replay
(
serverView
);
BridgeZkCoordinator
bridgeZkCoordinator
=
new
BridgeZkCoordinator
(
BridgeZkCoordinator
bridgeZkCoordinator
=
new
BridgeZkCoordinator
(
jsonMapper
,
jsonMapper
,
zkPathsConfig
,
zkPathsConfig
,
...
@@ -163,9 +167,9 @@ public class DruidClusterBridgeTest
...
@@ -163,9 +167,9 @@ public class DruidClusterBridgeTest
Announcer
announcer
=
new
Announcer
(
remoteCf
,
Executors
.
newSingleThreadExecutor
());
Announcer
announcer
=
new
Announcer
(
remoteCf
,
Executors
.
newSingleThreadExecutor
());
announcer
.
start
();
announcer
.
start
();
announcer
.
announce
(
zkPathsConfig
.
getAnnouncementsPath
()
+
"/"
+
me
.
getHost
(),
jsonMapper
.
writeValueAsBytes
(
me
));
announcer
.
announce
(
zkPathsConfig
.
getAnnouncementsPath
()
+
"/"
+
me
.
getHost
(),
jsonMapper
.
writeValueAsBytes
(
me
));
BatchDataSegmentAnnouncer
batchDataSegmentAnnouncer
=
EasyMock
.
createMock
(
BatchDataSegmentAnnouncer
.
class
);
BatchDataSegmentAnnouncer
batchDataSegmentAnnouncer
=
EasyMock
.
createMock
(
BatchDataSegmentAnnouncer
.
class
);
BatchServerInventoryView
batchServerInventoryView
=
EasyMock
.
createMock
(
BatchServerInventoryView
.
class
);
BatchServerInventoryView
batchServerInventoryView
=
EasyMock
.
createMock
(
BatchServerInventoryView
.
class
);
EasyMock
.
expect
(
batchServerInventoryView
.
getInventory
()).
andReturn
(
EasyMock
.
expect
(
batchServerInventoryView
.
getInventory
()).
andReturn
(
Arrays
.
asList
(
Arrays
.
asList
(
new
DruidServer
(
"1"
,
"localhost"
,
117
,
"historical"
,
DruidServer
.
DEFAULT_TIER
,
0
),
new
DruidServer
(
"1"
,
"localhost"
,
117
,
"historical"
,
DruidServer
.
DEFAULT_TIER
,
0
),
...
@@ -187,7 +191,6 @@ public class DruidClusterBridgeTest
...
@@ -187,7 +191,6 @@ public class DruidClusterBridgeTest
EasyMock
.
expectLastCall
();
EasyMock
.
expectLastCall
();
EasyMock
.
replay
(
batchServerInventoryView
);
EasyMock
.
replay
(
batchServerInventoryView
);
DruidClusterBridge
bridge
=
new
DruidClusterBridge
(
DruidClusterBridge
bridge
=
new
DruidClusterBridge
(
jsonMapper
,
jsonMapper
,
config
,
config
,
...
@@ -224,21 +227,40 @@ public class DruidClusterBridgeTest
...
@@ -224,21 +227,40 @@ public class DruidClusterBridgeTest
retry
++;
retry
++;
}
}
DruidServerMetadata
announced
=
jsonMapper
.
readValue
(
boolean
verified
=
verifyUpdate
(
jsonMapper
,
path
,
remoteCf
);
remoteCf
.
getData
().
forPath
(
path
),
retry
=
0
;
DruidServerMetadata
.
class
while
(!
verified
)
{
);
if
(
retry
>
5
)
{
throw
new
ISE
(
"No updates to bridge node occurred"
);
}
Assert
.
assertEquals
(
118
,
announced
.
getMaxSize
());
Thread
.
sleep
(
100
);
retry
++;
bridge
.
stop
(
);
verified
=
verifyUpdate
(
jsonMapper
,
path
,
remoteCf
);
EasyMock
.
verify
(
batchServerInventoryView
);
}
announcer
.
stop
();
announcer
.
stop
();
bridge
.
stop
();
remoteCf
.
close
();
remoteCf
.
close
();
remoteCluster
.
close
();
remoteCluster
.
close
();
localCf
.
close
();
localCf
.
close
();
localCluster
.
close
();
localCluster
.
close
();
EasyMock
.
verify
(
batchServerInventoryView
);
EasyMock
.
verify
(
dbSegmentPublisher
);
EasyMock
.
verify
(
databaseSegmentManager
);
EasyMock
.
verify
(
serverView
);
}
private
boolean
verifyUpdate
(
ObjectMapper
jsonMapper
,
String
path
,
CuratorFramework
remoteCf
)
throws
Exception
{
DruidServerMetadata
announced
=
jsonMapper
.
readValue
(
remoteCf
.
getData
().
forPath
(
path
),
DruidServerMetadata
.
class
);
return
(
118
==
announced
.
getMaxSize
());
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录