Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
d1de8cab
M
milvus
项目概览
milvus
/
milvus
11 个月 前同步成功
通知
260
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
d1de8cab
编写于
6月 13, 2022
作者:
C
congqixia
提交者:
GitHub
6月 13, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix %w verb for error wrapping in grpcclient (#17484)
Signed-off-by:
N
Congqi Xia
<
congqi.xia@zilliz.com
>
上级
a206f727
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
200 addition
and
5 deletion
+200
-5
internal/util/grpcclient/client.go
internal/util/grpcclient/client.go
+5
-5
internal/util/grpcclient/client_test.go
internal/util/grpcclient/client_test.go
+195
-0
未找到文件。
internal/util/grpcclient/client.go
浏览文件 @
d1de8cab
...
...
@@ -223,8 +223,8 @@ func (c *ClientBase) Call(ctx context.Context, caller func(client interface{}) (
ret
,
err
:=
c
.
callOnce
(
ctx
,
caller
)
if
err
!=
nil
{
traceErr
:=
fmt
.
Errorf
(
"err: %
s
\n
, %s"
,
err
.
Error
()
,
trace
.
StackTrace
())
log
.
Error
(
c
.
GetRole
()
+
" ClientBase Call grpc first call get error "
,
zap
.
Error
(
traceErr
))
traceErr
:=
fmt
.
Errorf
(
"err: %
w
\n
, %s"
,
err
,
trace
.
StackTrace
())
log
.
Error
(
"ClientBase Call grpc first call get error"
,
zap
.
String
(
"role"
,
c
.
GetRole
())
,
zap
.
Error
(
traceErr
))
return
nil
,
traceErr
}
return
ret
,
err
...
...
@@ -241,7 +241,7 @@ func (c *ClientBase) ReCall(ctx context.Context, caller func(client interface{})
return
ret
,
nil
}
traceErr
:=
fmt
.
Errorf
(
"err: %
s
\n
, %s"
,
err
.
Error
()
,
trace
.
StackTrace
())
traceErr
:=
fmt
.
Errorf
(
"err: %
w
\n
, %s"
,
err
,
trace
.
StackTrace
())
log
.
Warn
(
c
.
GetRole
()
+
" ClientBase ReCall grpc first call get error "
,
zap
.
Error
(
traceErr
))
if
!
funcutil
.
CheckCtxValid
(
ctx
)
{
...
...
@@ -250,8 +250,8 @@ func (c *ClientBase) ReCall(ctx context.Context, caller func(client interface{})
ret
,
err
=
c
.
callOnce
(
ctx
,
caller
)
if
err
!=
nil
{
traceErr
=
fmt
.
Errorf
(
"err: %
s
\n
, %s"
,
err
.
Error
()
,
trace
.
StackTrace
())
log
.
Error
(
c
.
GetRole
()
+
" ClientBase ReCall grpc second call get error "
,
zap
.
Error
(
traceErr
))
traceErr
=
fmt
.
Errorf
(
"err: %
w
\n
, %s"
,
err
,
trace
.
StackTrace
())
log
.
Error
(
"ClientBase ReCall grpc second call get error"
,
zap
.
String
(
"role"
,
c
.
GetRole
())
,
zap
.
Error
(
traceErr
))
return
nil
,
traceErr
}
return
ret
,
err
...
...
internal/util/grpcclient/client_test.go
浏览文件 @
d1de8cab
...
...
@@ -19,10 +19,13 @@ package grpcclient
import
(
"context"
"errors"
"sync"
"testing"
"time"
"github.com/stretchr/testify/assert"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
func
TestClientBase_SetRole
(
t
*
testing
.
T
)
{
...
...
@@ -49,4 +52,196 @@ func TestClientBase_connect(t *testing.T) {
assert
.
Error
(
t
,
err
)
assert
.
True
(
t
,
errors
.
Is
(
err
,
ErrConnect
))
})
t
.
Run
(
"failed to get addr"
,
func
(
t
*
testing
.
T
)
{
errMock
:=
errors
.
New
(
"mocked"
)
base
:=
ClientBase
{
getAddrFunc
:
func
()
(
string
,
error
)
{
return
""
,
errMock
},
DialTimeout
:
time
.
Millisecond
,
}
err
:=
base
.
connect
(
context
.
Background
())
assert
.
Error
(
t
,
err
)
assert
.
True
(
t
,
errors
.
Is
(
err
,
errMock
))
})
}
func
TestClientBase_Call
(
t
*
testing
.
T
)
{
// mock client with nothing
base
:=
ClientBase
{}
base
.
grpcClientMtx
.
Lock
()
base
.
grpcClient
=
struct
{}{}
base
.
grpcClientMtx
.
Unlock
()
t
.
Run
(
"Call normal return"
,
func
(
t
*
testing
.
T
)
{
_
,
err
:=
base
.
Call
(
context
.
Background
(),
func
(
client
interface
{})
(
interface
{},
error
)
{
return
struct
{}{},
nil
})
assert
.
NoError
(
t
,
err
)
})
t
.
Run
(
"Call with canceled context"
,
func
(
t
*
testing
.
T
)
{
ctx
,
cancel
:=
context
.
WithCancel
(
context
.
Background
())
cancel
()
_
,
err
:=
base
.
Call
(
ctx
,
func
(
client
interface
{})
(
interface
{},
error
)
{
return
struct
{}{},
nil
})
assert
.
Error
(
t
,
err
)
assert
.
True
(
t
,
errors
.
Is
(
err
,
context
.
Canceled
))
})
t
.
Run
(
"Call canceled in caller func"
,
func
(
t
*
testing
.
T
)
{
ctx
,
cancel
:=
context
.
WithCancel
(
context
.
Background
())
errMock
:=
errors
.
New
(
"mocked"
)
_
,
err
:=
base
.
Call
(
ctx
,
func
(
client
interface
{})
(
interface
{},
error
)
{
cancel
()
return
nil
,
errMock
})
assert
.
Error
(
t
,
err
)
assert
.
True
(
t
,
errors
.
Is
(
err
,
errMock
))
base
.
grpcClientMtx
.
RLock
()
// client shall not be reset
assert
.
NotNil
(
t
,
base
.
grpcClient
)
base
.
grpcClientMtx
.
RUnlock
()
})
t
.
Run
(
"Call canceled in caller func"
,
func
(
t
*
testing
.
T
)
{
ctx
,
cancel
:=
context
.
WithCancel
(
context
.
Background
())
errMock
:=
errors
.
New
(
"mocked"
)
_
,
err
:=
base
.
Call
(
ctx
,
func
(
client
interface
{})
(
interface
{},
error
)
{
cancel
()
return
nil
,
errMock
})
assert
.
Error
(
t
,
err
)
assert
.
True
(
t
,
errors
.
Is
(
err
,
errMock
))
base
.
grpcClientMtx
.
RLock
()
// client shall not be reset
assert
.
NotNil
(
t
,
base
.
grpcClient
)
base
.
grpcClientMtx
.
RUnlock
()
})
t
.
Run
(
"Call returns non-grpc error"
,
func
(
t
*
testing
.
T
)
{
ctx
,
cancel
:=
context
.
WithCancel
(
context
.
Background
())
defer
cancel
()
errMock
:=
errors
.
New
(
"mocked"
)
_
,
err
:=
base
.
Call
(
ctx
,
func
(
client
interface
{})
(
interface
{},
error
)
{
return
nil
,
errMock
})
assert
.
Error
(
t
,
err
)
assert
.
True
(
t
,
errors
.
Is
(
err
,
errMock
))
base
.
grpcClientMtx
.
RLock
()
// client shall not be reset
assert
.
NotNil
(
t
,
base
.
grpcClient
)
base
.
grpcClientMtx
.
RUnlock
()
})
t
.
Run
(
"Call returns grpc error"
,
func
(
t
*
testing
.
T
)
{
ctx
,
cancel
:=
context
.
WithCancel
(
context
.
Background
())
defer
cancel
()
errGrpc
:=
status
.
Error
(
codes
.
Unknown
,
"mocked"
)
_
,
err
:=
base
.
Call
(
ctx
,
func
(
client
interface
{})
(
interface
{},
error
)
{
return
nil
,
errGrpc
})
assert
.
Error
(
t
,
err
)
assert
.
True
(
t
,
errors
.
Is
(
err
,
errGrpc
))
base
.
grpcClientMtx
.
RLock
()
// client shall not be reset
assert
.
Nil
(
t
,
base
.
grpcClient
)
base
.
grpcClientMtx
.
RUnlock
()
})
base
.
grpcClientMtx
.
Lock
()
base
.
grpcClient
=
nil
base
.
grpcClientMtx
.
Unlock
()
base
.
SetGetAddrFunc
(
func
()
(
string
,
error
)
{
return
""
,
nil
})
t
.
Run
(
"Call with connect failure"
,
func
(
t
*
testing
.
T
)
{
ctx
,
cancel
:=
context
.
WithCancel
(
context
.
Background
())
defer
cancel
()
_
,
err
:=
base
.
Call
(
ctx
,
func
(
client
interface
{})
(
interface
{},
error
)
{
return
struct
{}{},
nil
})
assert
.
Error
(
t
,
err
)
assert
.
True
(
t
,
errors
.
Is
(
err
,
ErrConnect
))
})
}
func
TestClientBase_Recall
(
t
*
testing
.
T
)
{
// mock client with nothing
base
:=
ClientBase
{}
base
.
grpcClientMtx
.
Lock
()
base
.
grpcClient
=
struct
{}{}
base
.
grpcClientMtx
.
Unlock
()
t
.
Run
(
"Recall normal return"
,
func
(
t
*
testing
.
T
)
{
_
,
err
:=
base
.
ReCall
(
context
.
Background
(),
func
(
client
interface
{})
(
interface
{},
error
)
{
return
struct
{}{},
nil
})
assert
.
NoError
(
t
,
err
)
})
t
.
Run
(
"ReCall with canceled context"
,
func
(
t
*
testing
.
T
)
{
ctx
,
cancel
:=
context
.
WithCancel
(
context
.
Background
())
cancel
()
_
,
err
:=
base
.
ReCall
(
ctx
,
func
(
client
interface
{})
(
interface
{},
error
)
{
return
struct
{}{},
nil
})
assert
.
Error
(
t
,
err
)
assert
.
True
(
t
,
errors
.
Is
(
err
,
context
.
Canceled
))
})
t
.
Run
(
"ReCall fails first and success second"
,
func
(
t
*
testing
.
T
)
{
ctx
,
cancel
:=
context
.
WithCancel
(
context
.
Background
())
defer
cancel
()
flag
:=
false
var
mut
sync
.
Mutex
_
,
err
:=
base
.
ReCall
(
ctx
,
func
(
client
interface
{})
(
interface
{},
error
)
{
mut
.
Lock
()
defer
mut
.
Unlock
()
if
flag
{
return
struct
{}{},
nil
}
flag
=
true
return
nil
,
errors
.
New
(
"mock first"
)
})
assert
.
NoError
(
t
,
err
)
})
t
.
Run
(
"ReCall canceled in caller func"
,
func
(
t
*
testing
.
T
)
{
ctx
,
cancel
:=
context
.
WithCancel
(
context
.
Background
())
errMock
:=
errors
.
New
(
"mocked"
)
_
,
err
:=
base
.
ReCall
(
ctx
,
func
(
client
interface
{})
(
interface
{},
error
)
{
cancel
()
return
nil
,
errMock
})
assert
.
Error
(
t
,
err
)
assert
.
True
(
t
,
errors
.
Is
(
err
,
context
.
Canceled
))
base
.
grpcClientMtx
.
RLock
()
// client shall not be reset
assert
.
NotNil
(
t
,
base
.
grpcClient
)
base
.
grpcClientMtx
.
RUnlock
()
})
base
.
grpcClientMtx
.
Lock
()
base
.
grpcClient
=
nil
base
.
grpcClientMtx
.
Unlock
()
base
.
SetGetAddrFunc
(
func
()
(
string
,
error
)
{
return
""
,
nil
})
t
.
Run
(
"ReCall with connect failure"
,
func
(
t
*
testing
.
T
)
{
ctx
,
cancel
:=
context
.
WithCancel
(
context
.
Background
())
defer
cancel
()
_
,
err
:=
base
.
ReCall
(
ctx
,
func
(
client
interface
{})
(
interface
{},
error
)
{
return
struct
{}{},
nil
})
assert
.
Error
(
t
,
err
)
assert
.
True
(
t
,
errors
.
Is
(
err
,
ErrConnect
))
})
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录