fix:#1143 Feature/reduce etcd registry conn; wait group modify

remoting/etcdv3/facade.go

@@ -23,14 +23,11 @@ import (
 )
 
 import (
-	"github.com/apache/dubbo-getty"
 	gxetcd "github.com/dubbogo/gost/database/kv/etcd/v3"
-	perrors "github.com/pkg/errors"
 )
 
 import (
 	"dubbo.apache.org/dubbo-go/v3/common"
-	"dubbo.apache.org/dubbo-go/v3/common/constant"
 	"dubbo.apache.org/dubbo-go/v3/common/logger"
 )
 
@@ -46,54 +43,16 @@ type clientFacade interface {
 
 // HandleClientRestart keeps the connection between client and server
 func HandleClientRestart(r clientFacade) {
-	var (
-		err       error
-		failTimes int
-	)
-
 	defer r.WaitGroup().Done()
-LOOP:
 	for {
 		select {
+		case <-r.Client().GetCtx().Done():
+			r.RestartCallBack()
+			// re-register all services
+			time.Sleep(10 * time.Microsecond)
 		case <-r.Done():
 			logger.Warnf("(ETCDV3ProviderRegistry)reconnectETCDV3 goroutine exit now...")
-			break LOOP
-			// re-register all services
-		case <-r.Client().Done():
-			r.ClientLock().Lock()
-			clientName := gxetcd.RegistryETCDV3Client
-			timeout, _ := time.ParseDuration(r.GetURL().GetParam(constant.REGISTRY_TIMEOUT_KEY, constant.DEFAULT_REG_TIMEOUT))
-			endpoints := r.Client().GetEndPoints()
-			r.Client().Close()
-			r.SetClient(nil)
-			r.ClientLock().Unlock()
-
-			// try to connect to etcd,
-			failTimes = 0
-			for {
-				select {
-				case <-r.Done():
-					logger.Warnf("(ETCDV3ProviderRegistry)reconnectETCDRegistry goroutine exit now...")
-					break LOOP
-				case <-getty.GetTimeWheel().After(timeSecondDuration(failTimes * gxetcd.ConnDelay)): // avoid connect frequent
-				}
-				err = ValidateClient(
-					r,
-					gxetcd.WithName(clientName),
-					gxetcd.WithEndpoints(endpoints...),
-					gxetcd.WithTimeout(timeout),
-					gxetcd.WithHeartbeat(1),
-				)
-				logger.Infof("ETCDV3ProviderRegistry.validateETCDV3Client(etcd Addr{%s}) = error{%#v}",
-					endpoints, perrors.WithStack(err))
-				if err == nil && r.RestartCallBack() {
-					break
-				}
-				failTimes++
-				if gxetcd.MaxFailTimes <= failTimes {
-					failTimes = gxetcd.MaxFailTimes
-				}
-			}
+			return
 		}
 	}
 }