tianxiaoliang commented on a change in pull request #1259:
URL:
https://github.com/apache/servicecomb-service-center/pull/1259#discussion_r805469925
##########
File path: server/service/disco/instance.go
##########
@@ -141,13 +143,63 @@ func UnregisterInstance(ctx context.Context, in
*pb.UnregisterInstanceRequest) e
func SendHeartbeat(ctx context.Context, in *pb.HeartbeatRequest) error {
remoteIP := util.GetIPFromContext(ctx)
+ instanceID := in.InstanceId
+ serviceID := in.ServiceId
if err := validator.ValidateHeartbeatRequest(in); err != nil {
- log.Error(fmt.Sprintf("heartbeat failed, invalid parameters,
operator %s", remoteIP), err)
+ log.Error(fmt.Sprintf("send heartbeat[%s/%s] failed, invalid
parameters, operator %s",
+ serviceID, instanceID, remoteIP), err)
return pb.NewError(pb.ErrInvalidParams, err.Error())
}
- return datasource.GetMetadataManager().SendHeartbeat(ctx, in)
+ err := datasource.GetMetadataManager().SendHeartbeat(ctx, in)
+ if err != nil {
+ log.Error(fmt.Sprintf("send heartbeat[%s/%s] failed, operator
%s", serviceID, instanceID, remoteIP), err)
+ return err
+ }
+
+ // append the inner properties
+ err = appendInnerProperties(ctx, serviceID, instanceID)
+ if err != nil {
+ log.Error(fmt.Sprintf("append inner instance[%s/%s] properties
failed, operator %s",
+ serviceID, instanceID, remoteIP), err)
+ return err
+ }
+ return nil
+}
+
+func appendInnerProperties(ctx context.Context, serviceID string, instanceID
string) error {
+ resp, err := datasource.GetMetadataManager().GetInstance(ctx,
&pb.GetOneInstanceRequest{ProviderServiceId: serviceID, ProviderInstanceId:
instanceID})
+ if err != nil {
+ return err
Review comment:
print log
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
