Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
383e32b4
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
383e32b4
编写于
7月 22, 2021
作者:
A
Ax1an
提交者:
GitHub
7月 22, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix the persistent session timeout mechanism bug. (#7347)
上级
bf0e22d2
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
4 addition
and
2 deletion
+4
-2
CHANGES.md
CHANGES.md
+1
-0
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsPersistentWorker.java
.../server/core/analysis/worker/MetricsPersistentWorker.java
+2
-1
oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/MetricsEsDAO.java
...erver/storage/plugin/elasticsearch/base/MetricsEsDAO.java
+1
-1
未找到文件。
CHANGES.md
浏览文件 @
383e32b4
...
...
@@ -112,6 +112,7 @@ Release Notes.
*
Enhance persistent session timeout mechanism. Because the enhanced session could cache the metadata metrics forever,
new timeout mechanism is designed for avoiding this specific case.
*
Fix Kafka transport topics are created duplicated with and without namespace issue
*
Fix the persistent session timeout mechanism bug.
*
Fix possible version_conflict_engine_exception in bulk execution.
*
Fix PrometheusMetricConverter may throw an
`IllegalArgumentException`
when convert metrics to SampleFamily
*
Filtering NaN value samples when build SampleFamily
...
...
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/worker/MetricsPersistentWorker.java
浏览文件 @
383e32b4
...
...
@@ -275,7 +275,8 @@ public class MetricsPersistentWorker extends PersistenceWorker<Metrics> {
// Mostly all updatable metadata level metrics are required to do this check.
if
(
metricsDAO
.
isExpiredCache
(
model
,
cachedValue
,
currentTimeMillis
,
metricsDataTTL
))
{
// The expired metrics should be tagged `not in cache` directly.
// The expired metrics should be removed from the context and tagged `not in cache` directly.
context
.
remove
(
m
);
return
true
;
}
}
...
...
oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/base/MetricsEsDAO.java
浏览文件 @
383e32b4
...
...
@@ -135,7 +135,7 @@ public class MetricsEsDAO extends EsDAO implements IMetricsDAO {
return
false
;
}
final
long
deadline
=
Long
.
parseLong
(
new
DateTime
(
currentTimeMillis
).
plusDays
(-
ttl
).
toString
(
"yyyyMMdd"
));
final
long
timeBucket
=
TimeBucket
.
getTimeBucket
(
cachedValue
.
getTimeBucket
()
,
DownSampling
.
Day
);
final
long
timeBucket
=
TimeBucket
.
getTimeBucket
(
metricTimestamp
,
DownSampling
.
Day
);
// If time bucket is earlier or equals(mostly) the deadline, then the cached metric is expired.
if
(
timeBucket
<=
deadline
)
{
return
true
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录