Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
阿信在这里
SkyWalking
提交
e845ee02
S
SkyWalking
项目概览
阿信在这里
/
SkyWalking
与 Fork 源项目一致
Fork自
山不在高_有仙则灵 / SkyWalking
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e845ee02
编写于
12月 02, 2016
作者:
wu-sheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add network max-wait-time
上级
809e3d7b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
38 addition
and
11 deletion
+38
-11
skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/client/Agent2RoutingClient.java
...java/com/a/eye/skywalking/client/Agent2RoutingClient.java
+33
-11
skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/disruptor/AbstractRouteSpanEventHandler.java
...king/routing/disruptor/AbstractRouteSpanEventHandler.java
+5
-0
未找到文件。
skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/client/Agent2RoutingClient.java
浏览文件 @
e845ee02
...
...
@@ -26,7 +26,7 @@ public class Agent2RoutingClient extends Thread {
private
static
ILog
logger
=
LogManager
.
getLogger
(
Agent2RoutingClient
.
class
);
private
List
<
ServerAddr
>
addrList
;
private
Client
client
;
private
Client
client
;
private
SpanStorageClient
spanStorageClient
;
private
NetworkListener
listener
;
private
SendRequestSpanEventHandler
requestSpanDataSupplier
=
null
;
...
...
@@ -43,7 +43,7 @@ public class Agent2RoutingClient extends Thread {
if
(
addrSegments
.
length
!=
2
)
{
throw
new
IllegalArgumentException
(
"server addr should like ip:port, illegal addr:"
+
server
);
}
addrList
.
add
(
new
ServerAddr
(
addrSegments
[
0
],
addrSegments
[
2
]));
addrList
.
add
(
new
ServerAddr
(
addrSegments
[
0
],
addrSegments
[
1
]));
}
listener
=
new
NetworkListener
();
}
...
...
@@ -63,7 +63,7 @@ public class Agent2RoutingClient extends Thread {
private
void
connect
()
{
try
{
if
(
client
!=
null
&&
!
client
.
isShutdown
())
{
if
(
client
!=
null
&&
!
client
.
isShutdown
())
{
client
.
shutdown
();
}
int
addrIdx
=
new
Random
().
nextInt
(
addrList
.
size
());
...
...
@@ -84,26 +84,33 @@ public class Agent2RoutingClient extends Thread {
List
<
RequestSpan
>
requestData
=
this
.
requestSpanDataSupplier
.
getBufferData
();
List
<
AckSpan
>
ackData
=
this
.
ackSpanDataSupplier
.
getBufferData
();
if
(
requestData
.
size
()
>
0
||
ackData
.
size
()
>
0
)
{
boolean
hasData
=
false
;
if
(
requestData
.
size
()
>
0
)
{
hasData
=
true
;
listener
.
begin
();
spanStorageClient
.
sendRequestSpan
(
requestData
);
listener
.
wait2Confirm
();
}
if
(
ackData
.
size
()
>
0
)
{
hasData
=
true
;
listener
.
begin
();
spanStorageClient
.
sendACKSpan
(
ackData
);
while
(!
listener
.
isBatchFinished
())
{
try
{
Thread
.
sleep
(
10L
);
}
catch
(
InterruptedException
e
)
{
listener
.
wait2Confirm
();
}
}
}
}
else
{
if
(!
hasData
)
{
try
{
Thread
.
sleep
(
10
*
1000L
);
}
catch
(
InterruptedException
e
)
{
}
}
}
try
{
...
...
@@ -143,6 +150,21 @@ public class Agent2RoutingClient extends Thread {
HealthCollector
.
getCurrentHeathReading
(
"Agent2RoutingClient"
).
updateData
(
HeathReading
.
INFO
,
"batch send data to routing node."
);
}
void
wait2Confirm
(){
// wait 20s, most.
int
countDown
=
100
*
20
;
while
(!
listener
.
isBatchFinished
())
{
try
{
Thread
.
sleep
(
10L
);
if
(
countDown
--
<
0
){
batchFinished
=
true
;
}
}
catch
(
InterruptedException
e
)
{
}
}
}
}
...
...
skywalking-storage-center/skywalking-routing/src/main/java/com/a/eye/skywalking/routing/disruptor/AbstractRouteSpanEventHandler.java
浏览文件 @
e845ee02
...
...
@@ -56,9 +56,14 @@ public abstract class AbstractRouteSpanEventHandler<T> implements EventHandler<T
}
public
void
wait2Finish
()
{
// wait 20s, most
int
countDown
=
1000
*
20
;
while
(!
previousSendFinish
)
{
try
{
Thread
.
sleep
(
1L
);
if
(
countDown
--
<
0
){
previousSendFinish
=
true
;
}
}
catch
(
InterruptedException
e
)
{
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录