Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
eb59a917
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,发现更多精彩内容 >>
提交
eb59a917
编写于
11月 22, 2017
作者:
wu-sheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Do some rename works. :) And I think 7 ttl days is more common.
上级
f7700d50
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
12 addition
and
22 deletion
+12
-22
apm-collector/apm-collector-boot/docker/application.yml
apm-collector/apm-collector-boot/docker/application.yml
+1
-1
apm-collector/apm-collector-boot/src/main/resources/application.yml
...tor/apm-collector-boot/src/main/resources/application.yml
+1
-1
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/DataTTLKeeperTimer.java
...ywalking/apm/collector/storage/es/DataTTLKeeperTimer.java
+6
-16
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/StorageModuleEsProvider.java
...ing/apm/collector/storage/es/StorageModuleEsProvider.java
+4
-4
未找到文件。
apm-collector/apm-collector-boot/docker/application.yml
浏览文件 @
eb59a917
...
...
@@ -37,4 +37,4 @@ storage:
cluster_nodes
:
{
ES_ADDRESSES
}
index_shards_number
:
2
index_replicas_number
:
0
history_delete_before_days
:
3
ttl
:
7
apm-collector/apm-collector-boot/src/main/resources/application.yml
浏览文件 @
eb59a917
...
...
@@ -37,4 +37,4 @@ ui:
# cluster_nodes: localhost:9300
# index_shards_number: 2
# index_replicas_number: 0
# history_delete_before_days: 3
\ No newline at end of file
# ttl: 7
\ No newline at end of file
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/
HistoryDataDelete
Timer.java
→
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/
DataTTLKeeper
Timer.java
浏览文件 @
eb59a917
...
...
@@ -22,7 +22,6 @@ import java.util.Calendar;
import
java.util.concurrent.Executors
;
import
java.util.concurrent.TimeUnit
;
import
org.skywalking.apm.collector.core.module.ModuleManager
;
import
org.skywalking.apm.collector.core.util.CollectionUtils
;
import
org.skywalking.apm.collector.storage.StorageModule
;
import
org.skywalking.apm.collector.storage.dao.ICpuMetricPersistenceDAO
;
import
org.skywalking.apm.collector.storage.dao.IGCMetricPersistenceDAO
;
...
...
@@ -40,14 +39,14 @@ import org.skywalking.apm.collector.storage.dao.IServiceReferencePersistenceDAO;
/**
* @author peng-yongsheng
*/
public
class
HistoryDataDelete
Timer
{
public
class
DataTTLKeeper
Timer
{
private
final
ModuleManager
moduleManager
;
private
final
StorageModuleEsNamingListener
namingListener
;
private
final
String
selfAddress
;
private
final
int
daysBefore
;
public
HistoryDataDelete
Timer
(
ModuleManager
moduleManager
,
public
DataTTLKeeper
Timer
(
ModuleManager
moduleManager
,
StorageModuleEsNamingListener
namingListener
,
String
selfAddress
,
int
daysBefore
)
{
this
.
moduleManager
=
moduleManager
;
this
.
namingListener
=
namingListener
;
...
...
@@ -59,15 +58,6 @@ public class HistoryDataDeleteTimer {
Executors
.
newSingleThreadScheduledExecutor
().
scheduleAtFixedRate
(
this
::
delete
,
1
,
8
,
TimeUnit
.
HOURS
);
}
private
void
tryDelete
()
{
if
(
CollectionUtils
.
isNotEmpty
(
namingListener
.
getAddresses
()))
{
String
firstAddress
=
namingListener
.
getAddresses
().
iterator
().
next
();
if
(
firstAddress
.
equals
(
selfAddress
))
{
delete
();
}
}
}
private
void
delete
()
{
Calendar
calendar
=
Calendar
.
getInstance
();
calendar
.
setTimeInMillis
(
System
.
currentTimeMillis
());
...
...
@@ -82,11 +72,11 @@ public class HistoryDataDeleteTimer {
calendar
.
set
(
Calendar
.
SECOND
,
59
);
long
endTimestamp
=
calendar
.
getTimeInMillis
();
deleteJVM
Metric
Data
(
startTimestamp
,
endTimestamp
);
deleteTrace
Metric
Data
(
startTimestamp
,
endTimestamp
);
deleteJVM
Related
Data
(
startTimestamp
,
endTimestamp
);
deleteTrace
Related
Data
(
startTimestamp
,
endTimestamp
);
}
private
void
deleteJVM
Metric
Data
(
long
startTimestamp
,
long
endTimestamp
)
{
private
void
deleteJVM
Related
Data
(
long
startTimestamp
,
long
endTimestamp
)
{
ICpuMetricPersistenceDAO
cpuMetricPersistenceDAO
=
moduleManager
.
find
(
StorageModule
.
NAME
).
getService
(
ICpuMetricPersistenceDAO
.
class
);
cpuMetricPersistenceDAO
.
deleteHistory
(
startTimestamp
,
endTimestamp
);
...
...
@@ -100,7 +90,7 @@ public class HistoryDataDeleteTimer {
memoryPoolMetricPersistenceDAO
.
deleteHistory
(
startTimestamp
,
endTimestamp
);
}
private
void
deleteTrace
Metric
Data
(
long
startTimestamp
,
long
endTimestamp
)
{
private
void
deleteTrace
Related
Data
(
long
startTimestamp
,
long
endTimestamp
)
{
IGlobalTracePersistenceDAO
globalTracePersistenceDAO
=
moduleManager
.
find
(
StorageModule
.
NAME
).
getService
(
IGlobalTracePersistenceDAO
.
class
);
globalTracePersistenceDAO
.
deleteHistory
(
startTimestamp
,
endTimestamp
);
...
...
apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/StorageModuleEsProvider.java
浏览文件 @
eb59a917
...
...
@@ -117,10 +117,10 @@ public class StorageModuleEsProvider extends ModuleProvider {
private
static
final
String
CLUSTER_NODES
=
"cluster_nodes"
;
private
static
final
String
INDEX_SHARDS_NUMBER
=
"index_shards_number"
;
private
static
final
String
INDEX_REPLICAS_NUMBER
=
"index_replicas_number"
;
private
static
final
String
HISTORY_DELETE_BEFORE_DAYS
=
"history_delete_before_days
"
;
private
static
final
String
TIME_TO_LIVE_OF_DATA
=
"ttl
"
;
private
ElasticSearchClient
elasticSearchClient
;
private
HistoryDataDelete
Timer
deleteTimer
;
private
DataTTLKeeper
Timer
deleteTimer
;
@Override
public
String
name
()
{
return
NAME
;
...
...
@@ -163,8 +163,8 @@ public class StorageModuleEsProvider extends ModuleProvider {
ModuleListenerService
moduleListenerService
=
getManager
().
find
(
ClusterModule
.
NAME
).
getService
(
ModuleListenerService
.
class
);
moduleListenerService
.
addListener
(
namingListener
);
Integer
beforeDay
=
(
Integer
)
config
.
getOrDefault
(
HISTORY_DELETE_BEFORE_DAYS
,
3
);
deleteTimer
=
new
HistoryDataDelete
Timer
(
getManager
(),
namingListener
,
uuId
+
0
,
beforeDay
);
Integer
beforeDay
=
(
Integer
)
config
.
getOrDefault
(
TIME_TO_LIVE_OF_DATA
,
3
);
deleteTimer
=
new
DataTTLKeeper
Timer
(
getManager
(),
namingListener
,
uuId
+
0
,
beforeDay
);
}
@Override
public
void
notifyAfterCompleted
()
throws
ServiceNotProvidedException
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录