blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-23 18:00:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/errcode' into errcode

Browse Source
This commit is contained in:
withchao 2023-06-04 12:26:43 +08:00
commit f6921161a0
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/discoveryregistry/zookeeper/discover.go
View File

@ -107,7 +107,7 @@ func (s *ZkClient) GetConn(ctx context.Context, serviceName string, opts ...grpc
if len(conns) == 0 { if len(conns) == 0 {
return nil, ErrConnIsNil return nil, ErrConnIsNil
} }
return s.getConnBalance(conns), nil return s.getConnBalance(conns)
} }
func (s *ZkClient) GetFirstConn(ctx context.Context, serviceName string, opts ...grpc.DialOption) (*grpc.ClientConn, error) { func (s *ZkClient) GetFirstConn(ctx context.Context, serviceName string, opts ...grpc.DialOption) (*grpc.ClientConn, error) {

7
pkg/discoveryregistry/zookeeper/load_balancing.go
View File

@ -11,7 +11,10 @@ type RoundRobin struct {
lock sync.Mutex lock sync.Mutex
} }
func (r *RoundRobin) getConnBalance(conns []*grpc.ClientConn) (conn *grpc.ClientConn) { func (r *RoundRobin) getConnBalance(conns []*grpc.ClientConn) (conn *grpc.ClientConn, err error) {
if len(conns) == 0 {
return nil, ErrConnIsNil
}
r.lock.Lock() r.lock.Lock()
defer r.lock.Unlock() defer r.lock.Unlock()
if r.index < len(conns)-1 { if r.index < len(conns)-1 {
@ -19,5 +22,5 @@ func (r *RoundRobin) getConnBalance(conns []*grpc.ClientConn) (conn *grpc.Client
} else { } else {
r.index = 0 r.index = 0
} }
return conns[r.index] return conns[r.index], nil
} }