tianxiaoliang commented on a change in pull request #824:
URL:
https://github.com/apache/servicecomb-service-center/pull/824#discussion_r554981540
##########
File path: datasource/etcd/event/tag_event_handler.go
##########
@@ -60,13 +62,13 @@ func (apt *TagsChangedTask) publish(ctx context.Context,
domainProject, consumer
ctx = util.WithGlobal(util.WithCacheOnly(ctx))
consumer, err := serviceUtil.GetService(ctx, domainProject, consumerID)
- if err != nil {
- log.Errorf(err, "get consumer[%s] for publish event failed",
consumerID)
+ if errors.Is(err, datasource.ErrNoDocuments) {
Review comment:
error！=nil，然后再判断具体类型
##########
File path: datasource/etcd/ms.go
##########
@@ -670,39 +666,39 @@ func (ds *DataSource) GetInstance(ctx context.Context,
request *pb.GetOneInstanc
var err error
if len(request.ConsumerServiceId) > 0 {
service, err = serviceUtil.GetService(ctx, domainProject,
request.ConsumerServiceId)
- if err != nil {
- log.Errorf(err, "get consumer failed, consumer[%s] find
provider instance[%s/%s]",
- request.ConsumerServiceId,
request.ProviderServiceId, request.ProviderInstanceId)
- return &pb.GetOneInstanceResponse{
- Response: pb.CreateResponse(pb.ErrInternal,
err.Error()),
- }, err
- }
- if service == nil {
- log.Errorf(nil, "consumer does not exist, consumer[%s]
find provider instance[%s/%s]",
- request.ConsumerServiceId,
request.ProviderServiceId, request.ProviderInstanceId)
+ if errors.Is(err, datasource.ErrNoDocuments) {
+ log.Error(fmt.Sprintf("consumer does not exist,
consumer[%s] find provider instance[%s/%s]",
+ request.ConsumerServiceId,
request.ProviderServiceId, request.ProviderInstanceId), err)
return &pb.GetOneInstanceResponse{
Response:
pb.CreateResponse(pb.ErrServiceNotExists,
fmt.Sprintf("Consumer[%s] does not
exist.", request.ConsumerServiceId)),
}, nil
}
+ if err != nil {
Review comment:
具体错误在这里判断
##########
File path: datasource/etcd/ms.go
##########
@@ -751,39 +747,39 @@ func (ds *DataSource) GetInstances(ctx context.Context,
request *pb.GetInstances
var err error
if len(request.ConsumerServiceId) > 0 {
service, err = serviceUtil.GetService(ctx, domainProject,
request.ConsumerServiceId)
- if err != nil {
- log.Errorf(err, "get consumer failed, consumer[%s] find
provider instances",
- request.ConsumerServiceId,
request.ProviderServiceId)
- return &pb.GetInstancesResponse{
- Response: pb.CreateResponse(pb.ErrInternal,
err.Error()),
- }, err
- }
- if service == nil {
- log.Errorf(nil, "consumer does not exist, consumer[%s]
find provider instances",
- request.ConsumerServiceId,
request.ProviderServiceId)
+ if errors.Is(err, datasource.ErrNoDocuments) {
+ log.Error(fmt.Sprintf("consumer does not exist,
consumer[%s] find provider[%s] instances",
+ request.ConsumerServiceId,
request.ProviderServiceId), err)
return &pb.GetInstancesResponse{
Response:
pb.CreateResponse(pb.ErrServiceNotExists,
fmt.Sprintf("Consumer[%s] does not
exist.", request.ConsumerServiceId)),
}, nil
}
+ if err != nil {
Review comment:
具体错误在这里判断
##########
File path: datasource/errortypes.go
##########
@@ -0,0 +1,22 @@
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package datasource
+
+import "errors"
+
+var (
+ ErrNoDocuments = errors.New("no doc found")
Review comment:
ErrNoData
doc是mongo的技术术语
##########
File path: datasource/etcd/ms.go
##########
@@ -751,39 +747,39 @@ func (ds *DataSource) GetInstances(ctx context.Context,
request *pb.GetInstances
var err error
if len(request.ConsumerServiceId) > 0 {
service, err = serviceUtil.GetService(ctx, domainProject,
request.ConsumerServiceId)
- if err != nil {
- log.Errorf(err, "get consumer failed, consumer[%s] find
provider instances",
- request.ConsumerServiceId,
request.ProviderServiceId)
- return &pb.GetInstancesResponse{
- Response: pb.CreateResponse(pb.ErrInternal,
err.Error()),
- }, err
- }
- if service == nil {
- log.Errorf(nil, "consumer does not exist, consumer[%s]
find provider instances",
- request.ConsumerServiceId,
request.ProviderServiceId)
+ if errors.Is(err, datasource.ErrNoDocuments) {
+ log.Error(fmt.Sprintf("consumer does not exist,
consumer[%s] find provider[%s] instances",
Review comment:
不存在一个记录这种应该是debug级别日志
##########
File path: datasource/etcd/ms.go
##########
@@ -670,39 +666,39 @@ func (ds *DataSource) GetInstance(ctx context.Context,
request *pb.GetOneInstanc
var err error
if len(request.ConsumerServiceId) > 0 {
service, err = serviceUtil.GetService(ctx, domainProject,
request.ConsumerServiceId)
- if err != nil {
- log.Errorf(err, "get consumer failed, consumer[%s] find
provider instance[%s/%s]",
- request.ConsumerServiceId,
request.ProviderServiceId, request.ProviderInstanceId)
- return &pb.GetOneInstanceResponse{
- Response: pb.CreateResponse(pb.ErrInternal,
err.Error()),
- }, err
- }
- if service == nil {
- log.Errorf(nil, "consumer does not exist, consumer[%s]
find provider instance[%s/%s]",
- request.ConsumerServiceId,
request.ProviderServiceId, request.ProviderInstanceId)
+ if errors.Is(err, datasource.ErrNoDocuments) {
+ log.Error(fmt.Sprintf("consumer does not exist,
consumer[%s] find provider instance[%s/%s]",
+ request.ConsumerServiceId,
request.ProviderServiceId, request.ProviderInstanceId), err)
return &pb.GetOneInstanceResponse{
Response:
pb.CreateResponse(pb.ErrServiceNotExists,
fmt.Sprintf("Consumer[%s] does not
exist.", request.ConsumerServiceId)),
}, nil
}
+ if err != nil {
+ log.Error(fmt.Sprintf("get consumer failed,
consumer[%s] find provider instance[%s/%s]",
+ request.ConsumerServiceId,
request.ProviderServiceId, request.ProviderInstanceId), err)
+ return &pb.GetOneInstanceResponse{
+ Response: pb.CreateResponse(pb.ErrInternal,
err.Error()),
+ }, err
+ }
}
provider, err := serviceUtil.GetService(ctx, domainProject,
request.ProviderServiceId)
- if err != nil {
- log.Errorf(err, "get provider failed, consumer[%s] find
provider instance[%s/%s]",
- request.ConsumerServiceId, request.ProviderServiceId,
request.ProviderInstanceId)
- return &pb.GetOneInstanceResponse{
- Response: pb.CreateResponse(pb.ErrInternal,
err.Error()),
- }, err
- }
- if provider == nil {
- log.Errorf(nil, "provider does not exist, consumer[%s] find
provider instance[%s/%s]",
- request.ConsumerServiceId, request.ProviderServiceId,
request.ProviderInstanceId)
+ if errors.Is(err, datasource.ErrNoDocuments) {
+ log.Error(fmt.Sprintf("provider does not exist, consumer[%s]
find provider instance[%s/%s]",
+ request.ConsumerServiceId, request.ProviderServiceId,
request.ProviderInstanceId), err)
return &pb.GetOneInstanceResponse{
Response: pb.CreateResponse(pb.ErrServiceNotExists,
fmt.Sprintf("Provider[%s] does not exist.",
request.ProviderServiceId)),
}, nil
}
+ if err != nil {
Review comment:
具体错误在这里判断
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
