Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
d5d73833
M
milvus
项目概览
milvus
/
milvus
11 个月 前同步成功
通知
261
Star
22476
Fork
2472
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
milvus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
d5d73833
编写于
9月 02, 2021
作者:
Y
yukun
提交者:
GitHub
9月 02, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add some logs in rocksmq retention (#7403)
Signed-off-by:
N
fishpenguin
<
kun.yu@zilliz.com
>
上级
d4b979f6
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
11 addition
and
15 deletion
+11
-15
internal/util/rocksmq/server/rocksmq/rocksmq_retention.go
internal/util/rocksmq/server/rocksmq/rocksmq_retention.go
+11
-15
未找到文件。
internal/util/rocksmq/server/rocksmq/rocksmq_retention.go
浏览文件 @
d5d73833
...
...
@@ -260,8 +260,8 @@ func (ri *retentionInfo) retention() error {
return
nil
case
t
:=
<-
ticker
.
C
:
timeNow
:=
t
.
Unix
()
checkTime
:=
RocksmqRetentionTimeInMinutes
*
60
/
10
log
.
Debug
(
"
In
ticker: "
,
zap
.
Any
(
"ticker"
,
timeNow
))
checkTime
:=
RocksmqRetentionTimeInMinutes
*
MINUTE
/
10
log
.
Debug
(
"
A retention triggered by time
ticker: "
,
zap
.
Any
(
"ticker"
,
timeNow
))
ri
.
lastRetentionTime
.
Range
(
func
(
k
,
v
interface
{})
bool
{
if
v
.
(
int64
)
+
checkTime
<
timeNow
{
err
:=
ri
.
expiredCleanUp
(
k
.
(
string
))
...
...
@@ -271,14 +271,6 @@ func (ri *retentionInfo) retention() error {
}
return
true
})
// for k, v := range ri.lastRetentionTime {
// if v+checkTime < timeNow {
// err := ri.expiredCleanUp(k)
// if err != nil {
// panic(err)
// }
// }
// }
}
}
}
...
...
@@ -350,7 +342,7 @@ func (ri *retentionInfo) expiredCleanUp(topic string) error {
}
}
}
log
.
Debug
(
"
In expiredCleanUp: "
,
zap
.
Any
(
"topic"
,
topic
),
zap
.
Any
(
"e
ndID"
,
endID
),
zap
.
Any
(
"deletedAckedSize"
,
deletedAckedSize
))
log
.
Debug
(
"
Expired check by page info"
,
zap
.
Any
(
"topic"
,
topic
),
zap
.
Any
(
"pageE
ndID"
,
endID
),
zap
.
Any
(
"deletedAckedSize"
,
deletedAckedSize
))
pageEndID
:=
endID
// The end msg of the page is not expired, find the last expired msg in this page
...
...
@@ -369,9 +361,10 @@ func (ri *retentionInfo) expiredCleanUp(topic string) error {
}
}
if
endID
==
0
{
log
.
Debug
(
"All messages are not expired"
)
log
.
Debug
(
"All messages are not expired"
,
zap
.
Any
(
"topic"
,
topic
)
)
return
nil
}
log
.
Debug
(
"Expired check by retention time"
,
zap
.
Any
(
"topic"
,
topic
),
zap
.
Any
(
"startID"
,
startID
),
zap
.
Any
(
"endID"
,
endID
),
zap
.
Any
(
"deletedAckedSize"
,
deletedAckedSize
))
// Delete page message size in rocksdb_kv
if
pageInfo
!=
nil
{
...
...
@@ -388,6 +381,7 @@ func (ri *retentionInfo) expiredCleanUp(topic string) error {
break
}
}
log
.
Debug
(
"Expired check by retention size"
,
zap
.
Any
(
"topic"
,
topic
),
zap
.
Any
(
"new endID"
,
endID
),
zap
.
Any
(
"new deletedAckedSize"
,
deletedAckedSize
))
}
if
pageEndID
>
0
&&
len
(
pageInfo
.
pageEndID
)
>
0
{
...
...
@@ -403,7 +397,7 @@ func (ri *retentionInfo) expiredCleanUp(topic string) error {
log
.
Debug
(
"Delete page info"
,
zap
.
Any
(
"topic"
,
topic
),
zap
.
Any
(
"pageStartID"
,
pageStartID
),
zap
.
Any
(
"pageEndID"
,
pageEndID
))
if
pageStartID
==
pageEndID
{
pageWriteBatch
.
Delete
([]
byte
(
pageStartKey
))
}
else
{
}
else
if
pageStartID
<
pageEndID
{
pageWriteBatch
.
DeleteRange
([]
byte
(
pageStartKey
),
[]
byte
(
pageEndKey
))
}
ri
.
kv
.
DB
.
Write
(
gorocksdb
.
NewDefaultWriteOptions
(),
pageWriteBatch
)
...
...
@@ -412,6 +406,7 @@ func (ri *retentionInfo) expiredCleanUp(topic string) error {
}
ri
.
pageInfo
.
Store
(
topic
,
pageInfo
)
}
log
.
Debug
(
"ExpiredCleanUp: "
,
zap
.
Any
(
"topic"
,
topic
),
zap
.
Any
(
"startID"
,
startID
),
zap
.
Any
(
"endID"
,
endID
),
zap
.
Any
(
"deletedAckedSize"
,
deletedAckedSize
))
// Delete acked_ts in rocksdb_kv
fixedAckedTsTitle
,
err
:=
constructKey
(
AckedTsTitle
,
topic
)
...
...
@@ -422,7 +417,9 @@ func (ri *retentionInfo) expiredCleanUp(topic string) error {
ackedEndIDKey
:=
fixedAckedTsTitle
+
"/"
+
strconv
.
Itoa
(
int
(
endID
))
ackedTsWriteBatch
:=
gorocksdb
.
NewWriteBatch
()
defer
ackedTsWriteBatch
.
Clear
()
if
startID
==
endID
{
if
startID
>
endID
{
return
nil
}
else
if
startID
==
endID
{
ackedTsWriteBatch
.
Delete
([]
byte
(
ackedStartIDKey
))
}
else
{
ackedTsWriteBatch
.
DeleteRange
([]
byte
(
ackedStartIDKey
),
[]
byte
(
ackedEndIDKey
))
...
...
@@ -470,7 +467,6 @@ func DeleteMessages(db *gorocksdb.DB, topic string, startID, endID UniqueID) err
writeBatch
:=
gorocksdb
.
NewWriteBatch
()
defer
writeBatch
.
Clear
()
log
.
Debug
(
"Delete messages by range"
,
zap
.
Any
(
"topic"
,
topic
),
zap
.
Any
(
"startID"
,
startID
),
zap
.
Any
(
"endID"
,
endID
))
if
startID
==
endID
{
writeBatch
.
Delete
([]
byte
(
startKey
))
}
else
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录