You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2022/01/14 09:04:36 UTC
[servicecomb-service-center] branch master updated: [fix] use heartbeat resource event to send heartbeatSet resource (#1222)
This is an automated email from the ASF dual-hosted git repository.
littlecui 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 466eb5e [fix] use heartbeat resource event to send heartbeatSet resource (#1222)
466eb5e is described below
commit 466eb5e391f8734c8e6efdb7dd4665255c0632d1
Author: robotljw <79...@qq.com>
AuthorDate: Fri Jan 14 17:04:29 2022 +0800
[fix] use heartbeat resource event to send heartbeatSet resource (#1222)
---
datasource/common.go | 15 +++++++--------
datasource/etcd/ms.go | 3 ++-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/datasource/common.go b/datasource/common.go
index d6f21ea..405d685 100644
--- a/datasource/common.go
+++ b/datasource/common.go
@@ -27,12 +27,11 @@ const (
RegistryAppID = "default"
Provider = "p"
- ResourceAccount = "account"
- ResourceRole = "role"
- ResourceDependency = "dependency"
- ResourceService = "service"
- ResourceKV = "kv"
- ResourceInstance = "instance"
- ResourceHeartbeat = "heartbeat"
- ResourceHeartbeatSet = "heartbeatSet"
+ ResourceAccount = "account"
+ ResourceRole = "role"
+ ResourceDependency = "dependency"
+ ResourceService = "service"
+ ResourceKV = "kv"
+ ResourceInstance = "instance"
+ ResourceHeartbeat = "heartbeat"
)
diff --git a/datasource/etcd/ms.go b/datasource/etcd/ms.go
index 18d0095..355c08d 100644
--- a/datasource/etcd/ms.go
+++ b/datasource/etcd/ms.go
@@ -986,12 +986,13 @@ func (ds *MetadataManager) SendManyHeartbeat(ctx context.Context, request *pb.He
for heartbeat := range instancesHbRst {
count++
instanceHbRstArr = append(instanceHbRstArr, heartbeat)
+ sendEvent(ctx, sync.UpdateAction, datasource.ResourceHeartbeat,
+ &pb.HeartbeatRequest{ServiceId: heartbeat.ServiceId, InstanceId: heartbeat.InstanceId})
if count == noMultiCounter {
close(instancesHbRst)
}
}
log.Info(fmt.Sprintf("batch update heartbeats, %v", instanceHbRstArr))
- sendEvent(ctx, sync.UpdateAction, datasource.ResourceHeartbeatSet, request)
return &pb.HeartbeatSetResponse{
Instances: instanceHbRstArr,
}, nil