Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
f4ab7b53
S
SkyWalking
项目概览
apache
/
SkyWalking
上一次同步 1 年多
通知
302
Star
21345
Fork
6091
代码
文件
提交
分支
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,发现更多精彩内容 >>
提交
f4ab7b53
编写于
2月 23, 2016
作者:
A
ascrutae
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/master'
上级
3a86701c
62789738
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
142 addition
and
13 deletion
+142
-13
skywalking-api/src/main/java/com/ai/cloud/skywalking/buffer/BufferGroup.java
...main/java/com/ai/cloud/skywalking/buffer/BufferGroup.java
+3
-4
skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/AtomicRangeInteger.java
...java/com/ai/cloud/skywalking/util/AtomicRangeInteger.java
+67
-0
skywalking-protocol/src/test/java/test/ai/cloud/skywalking/util/AtomicRangeIntegerTest.java
...test/ai/cloud/skywalking/util/AtomicRangeIntegerTest.java
+57
-0
skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/buffer/DataBufferThread.java
...ai/cloud/skywalking/reciever/buffer/DataBufferThread.java
+15
-9
未找到文件。
skywalking-api/src/main/java/com/ai/cloud/skywalking/buffer/BufferGroup.java
浏览文件 @
f4ab7b53
...
@@ -5,8 +5,6 @@ import static com.ai.cloud.skywalking.conf.Config.Consumer.CONSUMER_FAIL_RETRY_W
...
@@ -5,8 +5,6 @@ import static com.ai.cloud.skywalking.conf.Config.Consumer.CONSUMER_FAIL_RETRY_W
import
static
com
.
ai
.
cloud
.
skywalking
.
conf
.
Config
.
Consumer
.
MAX_CONSUMER
;
import
static
com
.
ai
.
cloud
.
skywalking
.
conf
.
Config
.
Consumer
.
MAX_CONSUMER
;
import
static
com
.
ai
.
cloud
.
skywalking
.
conf
.
Config
.
Consumer
.
MAX_WAIT_TIME
;
import
static
com
.
ai
.
cloud
.
skywalking
.
conf
.
Config
.
Consumer
.
MAX_WAIT_TIME
;
import
java.util.concurrent.atomic.AtomicInteger
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
org.apache.logging.log4j.Logger
;
...
@@ -14,12 +12,13 @@ import com.ai.cloud.skywalking.conf.Config;
...
@@ -14,12 +12,13 @@ import com.ai.cloud.skywalking.conf.Config;
import
com.ai.cloud.skywalking.conf.Constants
;
import
com.ai.cloud.skywalking.conf.Constants
;
import
com.ai.cloud.skywalking.protocol.Span
;
import
com.ai.cloud.skywalking.protocol.Span
;
import
com.ai.cloud.skywalking.sender.DataSenderFactoryWithBalance
;
import
com.ai.cloud.skywalking.sender.DataSenderFactoryWithBalance
;
import
com.ai.cloud.skywalking.util.AtomicRangeInteger
;
public
class
BufferGroup
{
public
class
BufferGroup
{
private
static
Logger
logger
=
LogManager
.
getLogger
(
BufferGroup
.
class
);
private
static
Logger
logger
=
LogManager
.
getLogger
(
BufferGroup
.
class
);
private
String
groupName
;
private
String
groupName
;
private
Span
[]
dataBuffer
=
new
Span
[
BUFFER_MAX_SIZE
];
private
Span
[]
dataBuffer
=
new
Span
[
BUFFER_MAX_SIZE
];
Atomic
Integer
index
=
new
AtomicInteger
(
0
);
Atomic
RangeInteger
index
=
new
AtomicRangeInteger
(
0
,
BUFFER_MAX_SIZE
);
public
BufferGroup
(
String
groupName
)
{
public
BufferGroup
(
String
groupName
)
{
this
.
groupName
=
groupName
;
this
.
groupName
=
groupName
;
...
@@ -38,7 +37,7 @@ public class BufferGroup {
...
@@ -38,7 +37,7 @@ public class BufferGroup {
}
}
public
void
save
(
Span
span
)
{
public
void
save
(
Span
span
)
{
int
i
=
Math
.
abs
(
index
.
getAndIncrement
()
%
BUFFER_MAX_SIZE
);
int
i
=
index
.
getAndIncrement
(
);
if
(
dataBuffer
[
i
]
!=
null
)
{
if
(
dataBuffer
[
i
]
!=
null
)
{
logger
.
warn
(
logger
.
warn
(
"Group[{}] index[{}] data collision, discard old data."
,
"Group[{}] index[{}] data collision, discard old data."
,
...
...
skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/AtomicRangeInteger.java
0 → 100644
浏览文件 @
f4ab7b53
package
com.ai.cloud.skywalking.util
;
import
java.util.concurrent.atomic.AtomicInteger
;
/**
* 原子性,带范围性自增的整数
*
* @author wusheng
*
*/
public
class
AtomicRangeInteger
extends
Number
implements
java
.
io
.
Serializable
{
private
static
final
long
serialVersionUID
=
-
4099792402691141643L
;
private
AtomicInteger
value
;
private
int
startValue
;
private
int
endValue
;
/**
* Creates a new AtomicInteger with the given initial value and max value
*
* @param initialValue
* the initial value
*/
public
AtomicRangeInteger
(
int
startValue
,
int
endValue
)
{
value
=
new
AtomicInteger
(
startValue
);
this
.
startValue
=
startValue
;
this
.
endValue
=
endValue
;
}
/**
* Atomically increments by one the current value.
*
* @return the previous value
*/
public
final
int
getAndIncrement
()
{
for
(;;)
{
int
current
=
get
();
int
next
=
current
+
1
;
if
(
next
>=
this
.
endValue
)
{
next
=
this
.
startValue
;
}
if
(
value
.
compareAndSet
(
current
,
next
))
return
current
;
}
}
public
final
int
get
()
{
return
value
.
get
();
}
public
int
intValue
()
{
return
value
.
intValue
();
}
public
long
longValue
()
{
return
value
.
longValue
();
}
public
float
floatValue
()
{
return
value
.
floatValue
();
}
public
double
doubleValue
()
{
return
value
.
doubleValue
();
}
}
skywalking-protocol/src/test/java/test/ai/cloud/skywalking/util/AtomicRangeIntegerTest.java
0 → 100644
浏览文件 @
f4ab7b53
package
test.ai.cloud.skywalking.util
;
import
java.util.ArrayList
;
import
java.util.List
;
import
junit.framework.Assert
;
import
junit.framework.TestCase
;
import
com.ai.cloud.skywalking.util.AtomicRangeInteger
;
public
class
AtomicRangeIntegerTest
extends
TestCase
{
public
void
testGet
(){
AtomicRangeInteger
ari
=
new
AtomicRangeInteger
(
0
,
12
);
for
(
int
i
=
0
;
i
<
51
;
i
++){
System
.
out
.
print
(
ari
.
getAndIncrement
()
+
";"
);
}
}
public
void
testMultiThreads
(){
List
<
RangeIntegerThread
>
tlist
=
new
ArrayList
<
RangeIntegerThread
>();
for
(
int
i
=
0
;
i
<
20
;
i
++){
RangeIntegerThread
t
=
new
RangeIntegerThread
();
tlist
.
add
(
t
);
t
.
start
();
}
for
(
int
i
=
0
;
i
<
tlist
.
size
();
i
++){
try
{
tlist
.
get
(
i
).
join
();
}
catch
(
InterruptedException
e
)
{
e
.
printStackTrace
();
}
}
}
}
class
RangeIntegerThread
extends
Thread
{
private
static
String
[]
buffer
=
new
String
[
500000000
];
private
static
AtomicRangeInteger
ari
=
new
AtomicRangeInteger
(
0
,
buffer
.
length
);
@Override
public
void
run
(){
while
(
true
){
int
i
=
ari
.
getAndIncrement
();
if
(
i
%
10000000
==
0
){
System
.
out
.
println
(
ari
.
get
());
}
if
(
i
>=
buffer
.
length
-
100000
){
break
;
}
Assert
.
assertNull
(
buffer
[
i
]);
buffer
[
i
]
=
"string"
;
}
}
}
skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/buffer/DataBufferThread.java
浏览文件 @
f4ab7b53
package
com.ai.cloud.skywalking.reciever.buffer
;
package
com.ai.cloud.skywalking.reciever.buffer
;
import
org.apache.logging.log4j.LogManager
;
import
static
com
.
ai
.
cloud
.
skywalking
.
reciever
.
conf
.
Config
.
Buffer
.
DATA_BUFFER_FILE_PARENT_DIRECTORY
;
import
org.apache.logging.log4j.Logger
;
import
static
com
.
ai
.
cloud
.
skywalking
.
reciever
.
conf
.
Config
.
Buffer
.
DATA_CONFLICT_WAIT_TIME
;
import
static
com
.
ai
.
cloud
.
skywalking
.
reciever
.
conf
.
Config
.
Buffer
.
DATA_FILE_MAX_LENGTH
;
import
com.ai.cloud.skywalking.reciever.selfexamination.ServerHealthCollector
;
import
static
com
.
ai
.
cloud
.
skywalking
.
reciever
.
conf
.
Config
.
Buffer
.
FLUSH_NUMBER_OF_CACHE
;
import
com.ai.cloud.skywalking.reciever.selfexamination.ServerHeathReading
;
import
static
com
.
ai
.
cloud
.
skywalking
.
reciever
.
conf
.
Config
.
Buffer
.
MAX_WAIT_TIME
;
import
static
com
.
ai
.
cloud
.
skywalking
.
reciever
.
conf
.
Config
.
Buffer
.
PER_THREAD_MAX_BUFFER_NUMBER
;
import
static
com
.
ai
.
cloud
.
skywalking
.
reciever
.
conf
.
Config
.
Buffer
.
WRITE_DATA_FAILURE_RETRY_INTERVAL
;
import
java.io.File
;
import
java.io.File
;
import
java.io.FileNotFoundException
;
import
java.io.FileNotFoundException
;
import
java.io.FileOutputStream
;
import
java.io.FileOutputStream
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.util.UUID
;
import
java.util.UUID
;
import
java.util.concurrent.atomic.AtomicInteger
;
import
static
com
.
ai
.
cloud
.
skywalking
.
reciever
.
conf
.
Config
.
Buffer
.*;
import
org.apache.logging.log4j.LogManager
;
import
org.apache.logging.log4j.Logger
;
import
com.ai.cloud.skywalking.reciever.selfexamination.ServerHealthCollector
;
import
com.ai.cloud.skywalking.reciever.selfexamination.ServerHeathReading
;
import
com.ai.cloud.skywalking.util.AtomicRangeInteger
;
public
class
DataBufferThread
extends
Thread
{
public
class
DataBufferThread
extends
Thread
{
...
@@ -21,7 +27,7 @@ public class DataBufferThread extends Thread {
...
@@ -21,7 +27,7 @@ public class DataBufferThread extends Thread {
private
byte
[][]
data
=
new
byte
[
PER_THREAD_MAX_BUFFER_NUMBER
][];
private
byte
[][]
data
=
new
byte
[
PER_THREAD_MAX_BUFFER_NUMBER
][];
private
File
file
;
private
File
file
;
private
FileOutputStream
outputStream
;
private
FileOutputStream
outputStream
;
private
Atomic
Integer
index
=
new
AtomicInteger
(
);
private
Atomic
RangeInteger
index
=
new
AtomicRangeInteger
(
0
,
PER_THREAD_MAX_BUFFER_NUMBER
);
public
DataBufferThread
(
int
threadIdx
)
{
public
DataBufferThread
(
int
threadIdx
)
{
super
(
"DataBufferThread_"
+
threadIdx
);
super
(
"DataBufferThread_"
+
threadIdx
);
...
@@ -142,7 +148,7 @@ public class DataBufferThread extends Thread {
...
@@ -142,7 +148,7 @@ public class DataBufferThread extends Thread {
}
}
public
void
saveTemporarily
(
byte
[]
s
)
{
public
void
saveTemporarily
(
byte
[]
s
)
{
int
i
=
Math
.
abs
(
index
.
getAndIncrement
()
%
data
.
length
);
int
i
=
index
.
getAndIncrement
(
);
while
(
data
[
i
]
!=
null
)
{
while
(
data
[
i
]
!=
null
)
{
try
{
try
{
ServerHealthCollector
.
getCurrentHeathReading
(
null
).
updateData
(
ServerHeathReading
.
WARNING
,
"DataBuffer index["
+
i
+
"] data collision, service pausing. "
);
ServerHealthCollector
.
getCurrentHeathReading
(
null
).
updateData
(
ServerHeathReading
.
WARNING
,
"DataBuffer index["
+
i
+
"] data collision, service pausing. "
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录