SCB-2094 BugFix: GetAllConsumerIds method no data processing & heartbeat log problems (#951)
diff --git a/datasource/mongo/dep_util.go b/datasource/mongo/dep_util.go
index f2b7c3a..52c766a 100644
--- a/datasource/mongo/dep_util.go
+++ b/datasource/mongo/dep_util.go
@@ -19,10 +19,13 @@
import (
"context"
+ "errors"
"fmt"
- "github.com/apache/servicecomb-service-center/datasource/cache"
+
pb "github.com/go-chassis/cari/discovery"
+ "github.com/apache/servicecomb-service-center/datasource"
+ "github.com/apache/servicecomb-service-center/datasource/cache"
"github.com/apache/servicecomb-service-center/datasource/mongo/client/dao"
"github.com/apache/servicecomb-service-center/datasource/mongo/client/model"
)
@@ -42,7 +45,7 @@
}
allow, deny, err = GetConsumerIDsWithFilter(ctx, provider, providerRules)
- if err != nil {
+ if err != nil && !errors.Is(err, datasource.ErrNoData) {
return nil, nil, err
}
return allow, deny, nil
diff --git a/datasource/mongo/heartbeat/cache/heartbeat.go b/datasource/mongo/heartbeat/cache/heartbeat.go
index 4094cfd..1c99bb6 100644
--- a/datasource/mongo/heartbeat/cache/heartbeat.go
+++ b/datasource/mongo/heartbeat/cache/heartbeat.go
@@ -136,13 +136,13 @@
filter := util.NewFilter(util.InstanceServiceID(serviceID), util.InstanceInstanceID(instanceID))
result, err := client.GetMongoClient().FindOne(ctx, model.CollectionInstance, filter)
if err != nil {
- log.Error("failed to query instance: %v", err)
+ log.Error("failed to query instance", err)
return err
}
var ins model.Instance
err = result.Decode(&ins)
if err != nil {
- log.Error("decode instance failed: %v", err)
+ log.Error("decode instance failed", err)
return err
}
ttl := ins.Instance.HealthCheck.Interval * (ins.Instance.HealthCheck.Times + 1)
@@ -154,7 +154,7 @@
}
err = removeDBInstance(ctx, ins.Instance.ServiceId, ins.Instance.InstanceId)
if err != nil {
- log.Error("fail to remote instance in db: %v", err)
+ log.Error("fail to remote instance in db", err)
errAbort := session.AbortTransaction(ctx)
if errAbort != nil {
return errAbort
@@ -185,7 +185,7 @@
var ins model.Instance
err = result.Decode(&ins)
if err != nil {
- log.Error("decode instance failed: ", err)
+ log.Error("decode instance failed", err)
return nil, err
}
return &ins, nil
@@ -198,7 +198,7 @@
}
result, err := client.GetMongoClient().FindOneAndUpdate(ctx, model.CollectionInstance, filter, update)
if err != nil {
- log.Error("failed to update refresh time of instance: ", err)
+ log.Error("failed to update refresh time of instance", err)
return err
}
return result.Err()
diff --git a/datasource/mongo/heartbeat/checker/heartbeat.go b/datasource/mongo/heartbeat/checker/heartbeat.go
index 1bb3998..80fa356 100644
--- a/datasource/mongo/heartbeat/checker/heartbeat.go
+++ b/datasource/mongo/heartbeat/checker/heartbeat.go
@@ -36,7 +36,7 @@
}
result, err := client.GetMongoClient().FindOneAndUpdate(ctx, model.CollectionInstance, filter, update)
if err != nil {
- log.Error("failed to update refresh time of instance: ", err)
+ log.Error("failed to update refresh time of instance", err)
return err
}
if result.Err() != nil {
