Fix: fix deadlock when close client multi times (#817)

* Fix: fix deadlock when close client multi times

* Fix: Rename isClose to isClosed

Author: luoxiner

clients/config_client/config_client.go

@@ -60,6 +60,7 @@ type ConfigClient struct {
 	cacheMap                 cache.ConcurrentMap
 	uid                      string
 	listenExecute            chan struct{}
+	isClosed                 bool
 }
 
 type cacheData struct {
@@ -364,8 +365,15 @@ func (client *ConfigClient) SearchConfig(param vo.SearchConfigParam) (*model.Con
 }
 
 func (client *ConfigClient) CloseClient() {
+	client.mutex.Lock()
+	defer client.mutex.Unlock()
+
+	if client.isClosed {
+		return
+	}
 	client.configProxy.getRpcClient(client).Shutdown()
 	client.cancel()
+	client.isClosed = true
 }
 
 func (client *ConfigClient) searchConfigInner(param vo.SearchConfigParam) (*model.ConfigPage, error) {

clients/naming_client/naming_client.go

@@ -22,6 +22,7 @@ import (
 	"math"
 	"math/rand"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/pkg/errors"
@@ -43,6 +44,8 @@ type NamingClient struct {
 	cancel            context.CancelFunc
 	serviceProxy      naming_proxy.INamingProxy
 	serviceInfoHolder *naming_cache.ServiceInfoHolder
+	isClosed          bool
+	mutex             sync.Mutex
 }
 
 // NewNamingClient ...
@@ -356,6 +359,13 @@ func (sc *NamingClient) ServerHealthy() bool {
 
 // CloseClient ...
 func (sc *NamingClient) CloseClient() {
+	sc.mutex.Lock()
+	defer sc.mutex.Unlock()
+
+	if sc.isClosed {
+		return
+	}
 	sc.serviceProxy.CloseClient()
 	sc.cancel()
+	sc.isClosed = true
 }