[cherry-pick] fix: eureka register cache(release/1.5). (#994) (#996)

fix: eureka register cache(release/1.5). (#994)

fix eureka register cache.


(cherry picked from commit da98ab6)

Signed-off-by: Cybwan <[email protected]>
Signed-off-by: Lin Yang <[email protected]>
Co-authored-by: Cybwan <[email protected]>

Author: mergify[bot]

pkg/connector/provider/eureka.go

@@ -23,13 +23,22 @@ type heartbeat struct {
 func (h *heartbeat) run() {
 	slidingTimer := time.NewTimer(h.dc.connectController.GetEurekaHeartBeatPeriod())
 	defer slidingTimer.Stop()
+	fails := 0
 	for {
 		select {
 		case <-h.stop:
 			return
 		case <-slidingTimer.C:
 			if err := h.dc.eurekaClient().HeartBeatInstance(h.instance); err != nil {
 				log.Error().Err(err).Msgf("%s/%s heart beat error", h.instance.App, h.instance.InstanceId)
+				fails++
+			} else {
+				fails = 0
+			}
+			if fails >= 5 {
+				if err := h.dc.eurekaClient().RegisterInstance(h.instance); err == nil {
+					fails = 0
+				}
 			}
 			slidingTimer.Reset(h.dc.connectController.GetEurekaHeartBeatPeriod())
 		}
@@ -375,9 +384,7 @@ func (dc *EurekaDiscoveryClient) Deregister(dereg *connector.CatalogDeregistrati
 
 func (dc *EurekaDiscoveryClient) Register(reg *connector.CatalogRegistration) error {
 	ins := reg.ToEureka()
-	cacheIns := *ins
-	cacheIns.UniqueID = nil
-	return dc.connectController.CacheRegisterInstance(ins.InstanceId, cacheIns, func() error {
+	return dc.connectController.CacheRegisterInstance(ins.InstanceId, *reg, func() error {
 		err := dc.eurekaClient().RegisterInstance(ins)
 		if err == nil {
 			if dc.connectController.GetEurekaHeartBeatInstance() {