TRKJ/EdgeNode
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeNode.git synced 2025-11-08 03:00:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复RPC客户端管理没有加锁的问题

Browse Source
This commit is contained in:
GoEdgeLab
2021-11-20 18:57:00 +08:00
parent e19c3478af
commit b0899b7a96
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/rpc/rpc_client.go
View File

@@ -25,7 +25,7 @@ type RPCClient struct {
apiConfig *configs.APIConfig apiConfig *configs.APIConfig
conns []*grpc.ClientConn conns []*grpc.ClientConn
locker sync.Mutex locker sync.RWMutex
} }
func NewRPCClient(apiConfig *configs.APIConfig) (*RPCClient, error) { func NewRPCClient(apiConfig *configs.APIConfig) (*RPCClient, error) {
@@ -177,15 +177,23 @@ func (this *RPCClient) ClusterContext(clusterId string, clusterSecret string) co
// Close 关闭连接 // Close 关闭连接
func (this *RPCClient) Close() { func (this *RPCClient) Close() {
this.locker.Lock()
for _, conn := range this.conns { for _, conn := range this.conns {
_ = conn.Close() _ = conn.Close()
} }
this.locker.Unlock()
} }
// UpdateConfig 修改配置 // UpdateConfig 修改配置
func (this *RPCClient) UpdateConfig(config *configs.APIConfig) error { func (this *RPCClient) UpdateConfig(config *configs.APIConfig) error {
this.apiConfig = config this.apiConfig = config
return this.init()
this.locker.Lock()
err := this.init()
this.locker.Unlock()
return err
} }
// 初始化 // 初始化
@@ -223,8 +231,8 @@ func (this *RPCClient) init() error {
// 随机选择一个连接 // 随机选择一个连接
func (this *RPCClient) pickConn() *grpc.ClientConn { func (this *RPCClient) pickConn() *grpc.ClientConn {
this.locker.Lock() this.locker.RLock()
defer this.locker.Unlock() defer this.locker.RUnlock()
// 检查连接状态 // 检查连接状态
if len(this.conns) > 0 { if len(this.conns) > 0 {