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

registry/etcdv3/registry.go

@@ -96,8 +96,8 @@ func newETCDV3Registry(url *common.URL) (registry.Registry, error) {
 		return nil, err
 	}
 
-	go etcdv3.HandleClientRestart(r)
 
+	r.handleClientRestart()
 	r.InitListeners()
 
 	return r, nil
@@ -174,3 +174,8 @@ func (r *etcdV3Registry) DoSubscribe(svc *common.URL) (registry.Listener, error)
 func (r *etcdV3Registry) DoUnsubscribe(conf *common.URL) (registry.Listener, error) {
 	return nil, perrors.New("DoUnsubscribe is not support in etcdV3Registry")
 }
+
+func (r *etcdV3Registry) handleClientRestart() {
+	r.WaitGroup().Add(1)
+	go etcdv3.HandleClientRestart(r)
+}

registry/zookeeper/registry.go

@@ -74,6 +74,7 @@ func newZkRegistry(url *common.URL) (registry.Registry, error) {
 		return nil, err
 	}
 
+	r.WaitGroup().Add(1)
 	go zookeeper.HandleClientRestart(r)
 
 	r.listener = zookeeper.NewZkEventListener(r.client)
@@ -312,3 +313,8 @@ func (r *zkRegistry) getCloseListener(conf *common.URL) (*RegistryConfigurationL
 
 	return zkListener, nil
 }
+
+func (r *zkRegistry) handleClientRestart() {
+	r.WaitGroup().Add(1)
+	go zookeeper.HandleClientRestart(r)
+}

remoting/etcdv3/facade.go

@@ -42,8 +42,8 @@ type clientFacade interface {
 }
 
 // HandleClientRestart keeps the connection between client and server
+// This method should be used only once. You can use handleClientRestart() in package registry.
 func HandleClientRestart(r clientFacade) {
-	r.WaitGroup().Add(1)
 	defer r.WaitGroup().Done()
 	for {
 		select {

remoting/zookeeper/facade.go

@@ -42,8 +42,8 @@ type ZkClientFacade interface {
 }
 
 // HandleClientRestart keeps the connection between client and server
+// This method should be used only once. You can use handleClientRestart() in package registry.
 func HandleClientRestart(r ZkClientFacade) {
-	r.WaitGroup().Add(1)
 	defer r.WaitGroup().Done()
 	for {
 		select {