This is an automated email from the ASF dual-hosted git repository.
tianxiaoliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git
The following commit(s) were added to refs/heads/master by this push:
new 1a8351a [SCB-2094] Heartbeat interface optimization (#772)
1a8351a is described below
commit 1a8351ad7a7559bc9c40f3037697877d00f61d7e
Author: robotLJW <[email protected]>
AuthorDate: Wed Dec 2 17:39:21 2020 +0800
[SCB-2094] Heartbeat interface optimization (#772)
---
datasource/mongo/heartbeat/heartbeatchecker/heartbeat.go | 6 +++---
.../mongo/heartbeat/heartbeatchecker/heartbeat_test.go | 12 ++++++------
.../mongo/heartbeat/heartbeatchecker/heartbeatchecker.go | 8 ++++----
.../heartbeat/heartbeatchecker/heartbeatchecker_test.go | 5 +++--
4 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/datasource/mongo/heartbeat/heartbeatchecker/heartbeat.go
b/datasource/mongo/heartbeat/heartbeatchecker/heartbeat.go
index 57e50f0..29ab0de 100644
--- a/datasource/mongo/heartbeat/heartbeatchecker/heartbeat.go
+++ b/datasource/mongo/heartbeat/heartbeatchecker/heartbeat.go
@@ -21,16 +21,16 @@ import (
"context"
"time"
+ "go.mongodb.org/mongo-driver/bson"
+
"github.com/apache/servicecomb-service-center/datasource/mongo"
"github.com/apache/servicecomb-service-center/datasource/mongo/client"
"github.com/apache/servicecomb-service-center/pkg/log"
- "go.mongodb.org/mongo-driver/bson"
)
-func updateInstanceRefreshTime(ctx context.Context, serviceID string,
instanceID string) error {
+func updateInstanceRefreshTime(ctx context.Context, instanceID string) error {
filter := bson.M{
mongo.StringBuilder([]string{mongo.ColumnInstanceInfo,
mongo.ColumnInstanceID}): instanceID,
- mongo.StringBuilder([]string{mongo.ColumnInstanceInfo,
mongo.ColumnServiceID}): serviceID,
}
update := bson.M{
"$set": bson.M{mongo.RefreshTime: time.Now()},
diff --git a/datasource/mongo/heartbeat/heartbeatchecker/heartbeat_test.go
b/datasource/mongo/heartbeat/heartbeatchecker/heartbeat_test.go
index f77cd8e..ae66ac2 100644
--- a/datasource/mongo/heartbeat/heartbeatchecker/heartbeat_test.go
+++ b/datasource/mongo/heartbeat/heartbeatchecker/heartbeat_test.go
@@ -22,13 +22,14 @@ import (
"testing"
"time"
- "github.com/apache/servicecomb-service-center/datasource/mongo"
- "github.com/apache/servicecomb-service-center/datasource/mongo/client"
- "github.com/apache/servicecomb-service-center/pkg/log"
pb "github.com/go-chassis/cari/discovery"
"github.com/go-chassis/go-chassis/v2/storage"
"github.com/stretchr/testify/assert"
"go.mongodb.org/mongo-driver/bson"
+
+ "github.com/apache/servicecomb-service-center/datasource/mongo"
+ "github.com/apache/servicecomb-service-center/datasource/mongo/client"
+ "github.com/apache/servicecomb-service-center/pkg/log"
)
func init() {
@@ -40,7 +41,7 @@ func init() {
func TestUpdateInstanceRefreshTime(t *testing.T) {
t.Run("update instance refresh time: if the instance does not exist,the
update should fail", func(t *testing.T) {
- err := updateInstanceRefreshTime(context.Background(),
"not-exist", "not-exist")
+ err := updateInstanceRefreshTime(context.Background(),
"not-exist")
log.Error("", err)
assert.NotNil(t, err)
})
@@ -55,11 +56,10 @@ func TestUpdateInstanceRefreshTime(t *testing.T) {
}
_, err := client.GetMongoClient().Insert(context.Background(),
mongo.CollectionInstance, instance1)
assert.Equal(t, nil, err)
- err = updateInstanceRefreshTime(context.Background(),
instance1.InstanceInfo.ServiceId, instance1.InstanceInfo.InstanceId)
+ err = updateInstanceRefreshTime(context.Background(),
instance1.InstanceInfo.InstanceId)
assert.Equal(t, nil, err)
filter := bson.M{
mongo.StringBuilder([]string{mongo.ColumnInstanceInfo,
mongo.ColumnInstanceID}): instance1.InstanceInfo.InstanceId,
- mongo.StringBuilder([]string{mongo.ColumnInstanceInfo,
mongo.ColumnServiceID}): instance1.InstanceInfo.ServiceId,
}
result, err :=
client.GetMongoClient().FindOne(context.Background(), mongo.CollectionInstance,
filter)
assert.Nil(t, err)
diff --git a/datasource/mongo/heartbeat/heartbeatchecker/heartbeatchecker.go
b/datasource/mongo/heartbeat/heartbeatchecker/heartbeatchecker.go
index fad3ec0..ed98911 100644
--- a/datasource/mongo/heartbeat/heartbeatchecker/heartbeatchecker.go
+++ b/datasource/mongo/heartbeat/heartbeatchecker/heartbeatchecker.go
@@ -19,13 +19,13 @@ package heartbeatchecker
import (
"context"
+ "fmt"
+
+ pb "github.com/go-chassis/cari/discovery"
"github.com/apache/servicecomb-service-center/datasource/mongo/heartbeat"
"github.com/apache/servicecomb-service-center/pkg/log"
"github.com/apache/servicecomb-service-center/pkg/util"
- pb "github.com/go-chassis/cari/discovery"
-
- "fmt"
)
func init() {
@@ -41,7 +41,7 @@ func NewHeartBeatChecker(opts heartbeat.Options)
(heartbeat.HealthCheck, error)
func (h *HeartBeatChecker) Heartbeat(ctx context.Context, request
*pb.HeartbeatRequest) (*pb.HeartbeatResponse, error) {
remoteIP := util.GetIPFromContext(ctx)
- err := updateInstanceRefreshTime(ctx, request.ServiceId,
request.InstanceId)
+ err := updateInstanceRefreshTime(ctx, request.InstanceId)
if err != nil {
log.Error(fmt.Sprintf("heartbeat failed, instance[%s]. operator
%s", request.InstanceId, remoteIP), err)
resp := &pb.HeartbeatResponse{
diff --git
a/datasource/mongo/heartbeat/heartbeatchecker/heartbeatchecker_test.go
b/datasource/mongo/heartbeat/heartbeatchecker/heartbeatchecker_test.go
index ffe82b5..25d0b89 100644
--- a/datasource/mongo/heartbeat/heartbeatchecker/heartbeatchecker_test.go
+++ b/datasource/mongo/heartbeat/heartbeatchecker/heartbeatchecker_test.go
@@ -22,11 +22,12 @@ import (
"testing"
"time"
- "github.com/apache/servicecomb-service-center/datasource/mongo"
- "github.com/apache/servicecomb-service-center/datasource/mongo/client"
pb "github.com/go-chassis/cari/discovery"
"github.com/stretchr/testify/assert"
"go.mongodb.org/mongo-driver/bson"
+
+ "github.com/apache/servicecomb-service-center/datasource/mongo"
+ "github.com/apache/servicecomb-service-center/datasource/mongo/client"
)
func TestHeartbeat(t *testing.T) {
