Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
2aed48c4
M
milvus
项目概览
milvus
/
milvus
大约 1 年 前同步成功
通知
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,发现更多精彩内容 >>
未验证
提交
2aed48c4
编写于
12月 28, 2022
作者:
S
SimFG
提交者:
GitHub
12月 28, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix query node panic when watching dm channels (#21402)
Signed-off-by:
N
SimFG
<
bang.fu@zilliz.com
>
上级
6a29a964
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
28 addition
and
7 deletion
+28
-7
internal/querynode/impl.go
internal/querynode/impl.go
+8
-2
internal/querynode/impl_test.go
internal/querynode/impl_test.go
+16
-5
internal/util/concurrency/pool.go
internal/util/concurrency/pool.go
+4
-0
未找到文件。
internal/querynode/impl.go
浏览文件 @
2aed48c4
...
...
@@ -377,8 +377,14 @@ func (node *QueryNode) WatchDmChannels(ctx context.Context, in *querypb.WatchDmC
ErrorCode
:
commonpb
.
ErrorCode_Success
,
},
nil
})
ret
,
_
:=
future
.
Await
()
return
ret
.
(
*
commonpb
.
Status
),
nil
ret
,
err
:=
future
.
Await
()
if
status
,
ok
:=
ret
.
(
*
commonpb
.
Status
);
ok
{
return
status
,
nil
}
log
.
Warn
(
"fail to convert the *commonpb.Status"
,
zap
.
Any
(
"ret"
,
ret
),
zap
.
Error
(
err
))
return
&
commonpb
.
Status
{
ErrorCode
:
commonpb
.
ErrorCode_UnexpectedError
,
},
nil
}
func
(
node
*
QueryNode
)
UnsubDmChannel
(
ctx
context
.
Context
,
req
*
querypb
.
UnsubDmChannelRequest
)
(
*
commonpb
.
Status
,
error
)
{
...
...
internal/querynode/impl_test.go
浏览文件 @
2aed48c4
...
...
@@ -20,14 +20,11 @@ import (
"context"
"encoding/json"
"math/rand"
"runtime"
"sync"
"sync/atomic"
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
"github.com/milvus-io/milvus-proto/go-api/commonpb"
"github.com/milvus-io/milvus-proto/go-api/milvuspb"
"github.com/milvus-io/milvus/internal/common"
...
...
@@ -35,9 +32,14 @@ import (
"github.com/milvus-io/milvus/internal/proto/internalpb"
"github.com/milvus-io/milvus/internal/proto/querypb"
queryPb
"github.com/milvus-io/milvus/internal/proto/querypb"
"github.com/milvus-io/milvus/internal/util/concurrency"
"github.com/milvus-io/milvus/internal/util/etcd"
"github.com/milvus-io/milvus/internal/util/metricsinfo"
"github.com/milvus-io/milvus/internal/util/sessionutil"
"github.com/panjf2000/ants/v2"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
)
func
TestImpl_GetComponentStates
(
t
*
testing
.
T
)
{
...
...
@@ -115,6 +117,16 @@ func TestImpl_WatchDmChannels(t *testing.T) {
status
,
err
:=
node
.
WatchDmChannels
(
ctx
,
req
)
assert
.
NoError
(
t
,
err
)
assert
.
Equal
(
t
,
commonpb
.
ErrorCode_Success
,
status
.
ErrorCode
)
originPool
:=
node
.
taskPool
defer
func
()
{
node
.
taskPool
=
originPool
}()
node
.
taskPool
,
_
=
concurrency
.
NewPool
(
runtime
.
GOMAXPROCS
(
0
),
ants
.
WithPreAlloc
(
true
))
node
.
taskPool
.
Release
()
status
,
err
=
node
.
WatchDmChannels
(
ctx
,
req
)
assert
.
NoError
(
t
,
err
)
assert
.
Equal
(
t
,
commonpb
.
ErrorCode_UnexpectedError
,
status
.
ErrorCode
)
})
t
.
Run
(
"target not match"
,
func
(
t
*
testing
.
T
)
{
...
...
@@ -192,7 +204,6 @@ func TestImpl_WatchDmChannels(t *testing.T) {
assert
.
NoError
(
t
,
err
)
assert
.
Equal
(
t
,
commonpb
.
ErrorCode_UnexpectedError
,
status
.
ErrorCode
)
})
}
func
TestImpl_UnsubDmChannel
(
t
*
testing
.
T
)
{
...
...
internal/util/concurrency/pool.go
浏览文件 @
2aed48c4
...
...
@@ -67,3 +67,7 @@ func (pool *Pool) Cap() int {
func
(
pool
*
Pool
)
Running
()
int
{
return
pool
.
inner
.
Running
()
}
func
(
pool
*
Pool
)
Release
()
{
pool
.
inner
.
Release
()
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录