milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename error to match the nameing rules (#27214) 

Signed-off-by: yah01 <yah2er0ne@outlook.com>
pull/27250/head
yah01 2023-09-20 10:59:24 +08:00 committed by GitHub
parent b4f86ea55e
commit 9baff1b81c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/util/grpcclient/client.go
View File

@ -527,7 +527,7 @@ func (c *ClientBase[T]) SetSession(sess *sessionutil.Session) {
func IsCrossClusterRoutingErr(err error) bool {
// GRPC utilizes `status.Status` to encapsulate errors,
// hence it is not viable to employ the `errors.Is` for assessment.
return strings.Contains(err.Error(), merr.ErrCrossClusterRouting.Error())
return strings.Contains(err.Error(), merr.ErrServiceCrossClusterRouting.Error())
}
func IsServerIDMismatchErr(err error) bool {

4
pkg/util/interceptor/cluster_interceptor.go
View File

@ -43,7 +43,7 @@ func ClusterValidationUnaryServerInterceptor() grpc.UnaryServerInterceptor {
}
cluster := clusters[0]
if cluster != "" && cluster != paramtable.Get().CommonCfg.ClusterPrefix.GetValue() {
return nil, merr.WrapErrCrossClusterRouting(paramtable.Get().CommonCfg.ClusterPrefix.GetValue(), cluster)
return nil, merr.WrapErrServiceCrossClusterRouting(paramtable.Get().CommonCfg.ClusterPrefix.GetValue(), cluster)
}
return handler(ctx, req)
}
@ -64,7 +64,7 @@ func ClusterValidationStreamServerInterceptor() grpc.StreamServerInterceptor {
}
cluster := clusters[0]
if cluster != "" && cluster != paramtable.Get().CommonCfg.ClusterPrefix.GetValue() {
return merr.WrapErrCrossClusterRouting(paramtable.Get().CommonCfg.ClusterPrefix.GetValue(), cluster)
return merr.WrapErrServiceCrossClusterRouting(paramtable.Get().CommonCfg.ClusterPrefix.GetValue(), cluster)
}
return handler(srv, ss)
}

4
pkg/util/interceptor/cluster_interceptor_test.go
View File

@ -90,7 +90,7 @@ func TestClusterInterceptor(t *testing.T) {
md := metadata.Pairs(ClusterKey, "ins-1")
ctx = metadata.NewIncomingContext(context.Background(), md)
_, err = interceptor(ctx, req, serverInfo, handler)
assert.ErrorIs(t, err, merr.ErrCrossClusterRouting)
assert.ErrorIs(t, err, merr.ErrServiceCrossClusterRouting)
// with same cluster
md = metadata.Pairs(ClusterKey, paramtable.Get().CommonCfg.ClusterPrefix.GetValue())
@ -118,7 +118,7 @@ func TestClusterInterceptor(t *testing.T) {
md := metadata.Pairs(ClusterKey, "ins-1")
ctx = metadata.NewIncomingContext(context.Background(), md)
err = interceptor(nil, newMockSS(ctx), nil, handler)
assert.ErrorIs(t, err, merr.ErrCrossClusterRouting)
assert.ErrorIs(t, err, merr.ErrServiceCrossClusterRouting)
// with same cluster
md = metadata.Pairs(ClusterKey, paramtable.Get().CommonCfg.ClusterPrefix.GetValue())

2
pkg/util/merr/errors.go
View File

@ -38,7 +38,7 @@ var (
ErrServiceMemoryLimitExceeded = newMilvusError("memory limit exceeded", 3, false)
ErrServiceRequestLimitExceeded = newMilvusError("request limit exceeded", 4, true)
ErrServiceInternal = newMilvusError("service internal error", 5, false) // Never return this error out of Milvus
ErrCrossClusterRouting = newMilvusError("cross cluster routing", 6, false)
ErrServiceCrossClusterRouting = newMilvusError("cross cluster routing", 6, false)
ErrServiceDiskLimitExceeded = newMilvusError("disk limit exceeded", 7, false)
ErrServiceRateLimit = newMilvusError("rate limit exceeded", 8, true)
ErrServiceForceDeny = newMilvusError("force deny", 9, false)

2
pkg/util/merr/errors_test.go
View File

@ -75,7 +75,7 @@ func (s *ErrSuite) TestWrap() {
s.ErrorIs(WrapErrServiceMemoryLimitExceeded(110, 100, "MLE"), ErrServiceMemoryLimitExceeded)
s.ErrorIs(WrapErrServiceRequestLimitExceeded(100, "too many requests"), ErrServiceRequestLimitExceeded)
s.ErrorIs(WrapErrServiceInternal("never throw out"), ErrServiceInternal)
s.ErrorIs(WrapErrCrossClusterRouting("ins-0", "ins-1"), ErrCrossClusterRouting)
s.ErrorIs(WrapErrServiceCrossClusterRouting("ins-0", "ins-1"), ErrServiceCrossClusterRouting)
s.ErrorIs(WrapErrServiceDiskLimitExceeded(110, 100, "DLE"), ErrServiceDiskLimitExceeded)
s.ErrorIs(WrapErrNodeNotMatch(0, 1, "SIM"), ErrNodeNotMatch)

4
pkg/util/merr/utils.go
View File

@ -241,8 +241,8 @@ func WrapErrServiceInternal(msg string, others ...string) error {
return err
}
func WrapErrCrossClusterRouting(expectedCluster, actualCluster string, msg ...string) error {
err := errors.Wrapf(ErrCrossClusterRouting, "expectedCluster=%s, actualCluster=%s", expectedCluster, actualCluster)
func WrapErrServiceCrossClusterRouting(expectedCluster, actualCluster string, msg ...string) error {
err := errors.Wrapf(ErrServiceCrossClusterRouting, "expectedCluster=%s, actualCluster=%s", expectedCluster, actualCluster)
if len(msg) > 0 {
err = errors.Wrap(err, strings.Join(msg, "; "))
}