Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
01e609da
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,发现更多精彩内容 >>
未验证
提交
01e609da
编写于
12月 20, 2022
作者:
Y
yah01
提交者:
GitHub
12月 20, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix proxy doesn't update shard leaders cache for some types of error (#21185) (#21303)
Signed-off-by:
N
yah01
<
yang.cen@zilliz.com
>
上级
69b7eeb7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
16 deletion
+13
-16
internal/proxy/task_query.go
internal/proxy/task_query.go
+7
-9
internal/proxy/task_search.go
internal/proxy/task_search.go
+6
-7
未找到文件。
internal/proxy/task_query.go
浏览文件 @
01e609da
...
...
@@ -2,7 +2,6 @@ package proxy
import
(
"context"
"errors"
"fmt"
"strconv"
"strings"
...
...
@@ -17,7 +16,6 @@ import (
"github.com/milvus-io/milvus/internal/metrics"
"github.com/milvus-io/milvus/internal/types"
"github.com/milvus-io/milvus/internal/util/funcutil"
"github.com/milvus-io/milvus/internal/util/grpcclient"
"github.com/milvus-io/milvus/internal/util/timerecord"
"github.com/milvus-io/milvus/internal/util/tsoutil"
"github.com/milvus-io/milvus/internal/util/typeutil"
...
...
@@ -307,6 +305,7 @@ func (t *queryTask) PreExecute(ctx context.Context) error {
func
(
t
*
queryTask
)
Execute
(
ctx
context
.
Context
)
error
{
tr
:=
timerecord
.
NewTimeRecorder
(
fmt
.
Sprintf
(
"proxy execute query %d"
,
t
.
ID
()))
defer
tr
.
CtxElapse
(
ctx
,
"done"
)
log
:=
log
.
Ctx
(
ctx
)
executeQuery
:=
func
(
withCache
bool
)
error
{
shards
,
err
:=
globalMetaCache
.
GetShards
(
ctx
,
withCache
,
t
.
collectionName
)
...
...
@@ -323,17 +322,16 @@ func (t *queryTask) Execute(ctx context.Context) error {
}
err
:=
executeQuery
(
WithCache
)
if
errors
.
Is
(
err
,
errInvalidShardLeaders
)
||
funcutil
.
IsGrpcErr
(
err
)
||
errors
.
Is
(
err
,
grpcclient
.
ErrConnect
)
{
log
.
Ctx
(
ctx
)
.
Warn
(
"invalid shard leaders cache, updating shardleader caches and retry search"
,
zap
.
Int64
(
"msgID"
,
t
.
ID
()),
zap
.
Error
(
err
))
return
executeQuery
(
WithoutCache
)
if
err
!=
nil
{
log
.
Warn
(
"invalid shard leaders cache, updating shardleader caches and retry query"
,
zap
.
Error
(
err
))
err
=
executeQuery
(
WithoutCache
)
}
if
err
!=
nil
{
return
fmt
.
Errorf
(
"fail to
search
on all shard leaders, err=%s"
,
err
.
Error
())
return
fmt
.
Errorf
(
"fail to
query
on all shard leaders, err=%s"
,
err
.
Error
())
}
log
.
Ctx
(
ctx
)
.
Debug
(
"Query Execute done."
,
zap
.
Int64
(
"msgID"
,
t
.
ID
()),
zap
.
Any
(
"requestType"
,
"query"
))
log
.
Debug
(
"Query Execute done."
,
zap
.
Int64
(
"msgID"
,
t
.
ID
()),
zap
.
String
(
"requestType"
,
"query"
))
return
nil
}
...
...
internal/proxy/task_search.go
浏览文件 @
01e609da
...
...
@@ -21,7 +21,6 @@ import (
"github.com/milvus-io/milvus/internal/util/commonpbutil"
"github.com/milvus-io/milvus/internal/util/distance"
"github.com/milvus-io/milvus/internal/util/funcutil"
"github.com/milvus-io/milvus/internal/util/grpcclient"
"github.com/milvus-io/milvus/internal/util/timerecord"
"github.com/milvus-io/milvus/internal/util/trace"
"github.com/milvus-io/milvus/internal/util/tsoutil"
...
...
@@ -389,6 +388,7 @@ func (t *searchTask) Execute(ctx context.Context) error {
tr
:=
timerecord
.
NewTimeRecorder
(
fmt
.
Sprintf
(
"proxy execute search %d"
,
t
.
ID
()))
defer
tr
.
CtxElapse
(
ctx
,
"done"
)
log
:=
log
.
Ctx
(
ctx
)
executeSearch
:=
func
(
withCache
bool
)
error
{
shard2Leaders
,
err
:=
globalMetaCache
.
GetShards
(
ctx
,
withCache
,
t
.
collectionName
)
...
...
@@ -398,23 +398,22 @@ func (t *searchTask) Execute(ctx context.Context) error {
t
.
resultBuf
=
make
(
chan
*
internalpb
.
SearchResults
,
len
(
shard2Leaders
))
t
.
toReduceResults
=
make
([]
*
internalpb
.
SearchResults
,
0
,
len
(
shard2Leaders
))
if
err
:=
t
.
searchShardPolicy
(
ctx
,
t
.
shardMgr
,
t
.
searchShard
,
shard2Leaders
);
err
!=
nil
{
log
.
Ctx
(
ctx
)
.
Warn
(
"failed to do search"
,
zap
.
Error
(
err
),
zap
.
String
(
"Shards"
,
fmt
.
Sprintf
(
"%v"
,
shard2Leaders
)
))
log
.
Warn
(
"failed to do search"
,
zap
.
String
(
"Shards"
,
fmt
.
Sprintf
(
"%v"
,
shard2Leaders
)),
zap
.
Error
(
err
))
return
err
}
return
nil
}
err
:=
executeSearch
(
WithCache
)
if
errors
.
Is
(
err
,
errInvalidShardLeaders
)
||
funcutil
.
IsGrpcErr
(
err
)
||
errors
.
Is
(
err
,
grpcclient
.
ErrConnect
)
{
log
.
Ctx
(
ctx
)
.
Warn
(
"first search failed, updating shardleader caches and retry search"
,
zap
.
Int64
(
"msgID"
,
t
.
ID
()),
zap
.
Error
(
err
))
return
executeSearch
(
WithoutCache
)
if
err
!=
nil
{
log
.
Warn
(
"first search failed, updating shardleader caches and retry search"
,
zap
.
Error
(
err
))
err
=
executeSearch
(
WithoutCache
)
}
if
err
!=
nil
{
return
fmt
.
Errorf
(
"fail to search on all shard leaders, err=%v"
,
err
)
}
log
.
Ctx
(
ctx
)
.
Debug
(
"Search Execute done."
,
zap
.
Int64
(
"msgID"
,
t
.
ID
())
)
log
.
Debug
(
"Search Execute done"
)
return
nil
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录