Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
7a4de989
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,发现更多精彩内容 >>
未验证
提交
7a4de989
编写于
12月 24, 2021
作者:
X
Xiaofan
提交者:
GitHub
12月 24, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix Rocksmq ignored error (#14011)
Signed-off-by:
N
xiaofan-luan
<
xiaofan.luan@zilliz.com
>
上级
cc08dd2a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
49 addition
and
9 deletion
+49
-9
internal/proxy/impl.go
internal/proxy/impl.go
+4
-0
internal/util/rocksmq/server/rocksmq/rocksmq_impl.go
internal/util/rocksmq/server/rocksmq/rocksmq_impl.go
+22
-9
internal/util/rocksmq/server/rocksmq/rocksmq_impl_test.go
internal/util/rocksmq/server/rocksmq/rocksmq_impl_test.go
+23
-0
未找到文件。
internal/proxy/impl.go
浏览文件 @
7a4de989
...
...
@@ -3572,6 +3572,10 @@ func (node *Proxy) GetFlushState(ctx context.Context, req *milvuspb.GetFlushStat
}
resp
,
err
=
node
.
dataCoord
.
GetFlushState
(
ctx
,
req
)
if
err
!=
nil
{
log
.
Info
(
"failed to get flush state response"
,
zap
.
Error
(
err
))
return
nil
,
err
}
log
.
Info
(
"received get flush state response"
,
zap
.
Any
(
"response"
,
resp
))
return
resp
,
err
}
...
...
internal/util/rocksmq/server/rocksmq/rocksmq_impl.go
浏览文件 @
7a4de989
...
...
@@ -262,6 +262,7 @@ func (rmq *rocksmq) Close() {
defer
rmq
.
storeMu
.
Unlock
()
rmq
.
kv
.
Close
()
rmq
.
store
.
Close
()
log
.
Info
(
"Successfully close rocksmq"
)
}
func
(
rmq
*
rocksmq
)
stopRetention
()
{
...
...
@@ -565,7 +566,6 @@ func (rmq *rocksmq) Produce(topicName string, messages []ProducerMessage) ([]Uni
if
err
!=
nil
{
return
[]
UniqueID
{},
err
}
updatePageTime
:=
time
.
Since
(
start
)
.
Milliseconds
()
// TODO add this to monitor metrics
getProduceTime
:=
time
.
Since
(
start
)
.
Milliseconds
()
...
...
@@ -574,7 +574,7 @@ func (rmq *rocksmq) Produce(topicName string, messages []ProducerMessage) ([]Uni
zap
.
Int64
(
"get lock elapse"
,
getLockTime
),
zap
.
Int64
(
"alloc elapse"
,
allocTime
),
zap
.
Int64
(
"write elapse"
,
writeTime
),
zap
.
Int64
(
"updatePage elapse"
,
updatePag
eTime
))
zap
.
Int64
(
"updatePage elapse"
,
getProduc
eTime
))
}
return
msgIDs
,
nil
}
...
...
@@ -699,11 +699,17 @@ func (rmq *rocksmq) Consume(topicName string, groupName string, n int) ([]Consum
consumedIDs
=
append
(
consumedIDs
,
msg
.
MsgID
)
}
newID
:=
consumedIDs
[
len
(
consumedIDs
)
-
1
]
err
:=
rmq
.
updateAckedInfo
(
topicName
,
groupName
,
consumedIDs
)
if
err
!=
nil
{
log
.
Warn
(
"failed to update acked info "
,
zap
.
String
(
"topic"
,
topicName
),
zap
.
String
(
"groupName"
,
groupName
),
zap
.
Error
(
err
))
return
nil
,
err
}
rmq
.
moveConsumePos
(
topicName
,
groupName
,
newID
+
1
)
rmq
.
updateAckedInfo
(
topicName
,
groupName
,
consumedIDs
)
// TODO add this to monitor metrics
getConsumeTime
:=
time
.
Since
(
start
)
.
Milliseconds
()
if
get
LockTime
>
200
||
get
ConsumeTime
>
200
{
if
getConsumeTime
>
200
{
log
.
Warn
(
"rocksmq consume too slowly"
,
zap
.
String
(
"topic"
,
topicName
),
zap
.
Int64
(
"get lock elapse"
,
getLockTime
),
zap
.
Int64
(
"consume elapse"
,
getConsumeTime
))
}
...
...
@@ -764,7 +770,13 @@ func (rmq *rocksmq) Seek(topicName string, groupName string, msgID UniqueID) err
lock
.
Lock
()
defer
lock
.
Unlock
()
return
rmq
.
seek
(
topicName
,
groupName
,
msgID
)
err
:=
rmq
.
seek
(
topicName
,
groupName
,
msgID
)
if
err
!=
nil
{
log
.
Debug
(
"failed to seek"
,
zap
.
String
(
"topic"
,
topicName
),
zap
.
String
(
"group"
,
groupName
),
zap
.
Uint64
(
"msgId"
,
uint64
(
msgID
)),
zap
.
Error
(
err
))
return
err
}
log
.
Debug
(
"successfully seek"
,
zap
.
String
(
"topic"
,
topicName
),
zap
.
String
(
"group"
,
groupName
),
zap
.
Uint64
(
"msgId"
,
uint64
(
msgID
)))
return
nil
}
// SeekToLatest updates current id to the msg id of latest message + 1
...
...
@@ -786,8 +798,9 @@ func (rmq *rocksmq) SeekToLatest(topicName, groupName string) error {
iter
:=
rmq
.
store
.
NewIterator
(
readOpts
)
defer
iter
.
Close
()
prefix
:=
topicName
+
"/"
// seek to the last message of thie topic
iter
.
SeekForPrev
([]
byte
(
typeutil
.
AddOne
(
topicName
+
"/"
)))
iter
.
SeekForPrev
([]
byte
(
typeutil
.
AddOne
(
prefix
)))
// if iterate fail
if
err
:=
iter
.
Err
();
err
!=
nil
{
...
...
@@ -799,15 +812,13 @@ func (rmq *rocksmq) SeekToLatest(topicName, groupName string) error {
return
nil
}
fixTopicName
:=
topicName
+
"/"
iKey
:=
iter
.
Key
()
seekMsgID
:=
string
(
iKey
.
Data
())
if
iKey
!=
nil
{
iKey
.
Free
()
}
// if find message is not belong to current channel, start from 0
if
!
strings
.
Contains
(
seekMsgID
,
fixTopicName
)
{
if
!
strings
.
Contains
(
seekMsgID
,
prefix
)
{
return
nil
}
...
...
@@ -817,6 +828,8 @@ func (rmq *rocksmq) SeekToLatest(topicName, groupName string) error {
}
// current msgID should not be included
rmq
.
moveConsumePos
(
topicName
,
groupName
,
msgID
+
1
)
log
.
Debug
(
"successfully seek to latest"
,
zap
.
String
(
"topic"
,
topicName
),
zap
.
String
(
"group"
,
groupName
),
zap
.
Uint64
(
"latest"
,
uint64
(
msgID
+
1
)))
return
nil
}
...
...
internal/util/rocksmq/server/rocksmq/rocksmq_impl_test.go
浏览文件 @
7a4de989
...
...
@@ -861,3 +861,26 @@ func TestRocksmq_Close(t *testing.T) {
rmq
.
HasNext
(
""
,
""
)
rmq
.
CloseReader
(
""
,
""
)
}
func
TestRocksmq_SeekWithNoConsumerError
(
t
*
testing
.
T
)
{
ep
:=
etcdEndpoints
()
etcdKV
,
err
:=
etcdkv
.
NewEtcdKV
(
ep
,
"/etcd/test/root"
)
assert
.
Nil
(
t
,
err
)
defer
etcdKV
.
Close
()
idAllocator
:=
allocator
.
NewGlobalIDAllocator
(
"dummy"
,
etcdKV
)
_
=
idAllocator
.
Initialize
()
name
:=
"/tmp/rocksmq_seekerror"
defer
os
.
RemoveAll
(
name
)
kvName
:=
name
+
"_meta_kv"
_
=
os
.
RemoveAll
(
kvName
)
defer
os
.
RemoveAll
(
kvName
)
rmq
,
err
:=
NewRocksMQ
(
name
,
idAllocator
)
assert
.
Nil
(
t
,
err
)
defer
rmq
.
Close
()
rmq
.
CreateTopic
(
"test"
)
err
=
rmq
.
Seek
(
"test"
,
""
,
0
)
fmt
.
Println
(
err
)
assert
.
Error
(
t
,
err
)
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录