diff --git a/pkg/common/mw/rpc_client_interceptor.go b/pkg/common/mw/rpc_client_interceptor.go index 931768b98..498dfd9b8 100644 --- a/pkg/common/mw/rpc_client_interceptor.go +++ b/pkg/common/mw/rpc_client_interceptor.go @@ -23,7 +23,6 @@ func RpcClientInterceptor(ctx context.Context, method string, req, resp interfac if ctx == nil { return errs.ErrInternalServer.Wrap("call rpc request context is nil") } - log.ZInfo(ctx, "rpc client req", "funcName", method, "req", rpcString(req), "invoker", invoker, "invoker_type", fmt.Sprintf("%T", invoker)) ctx, err = getRpcContext(ctx, method) if err != nil { return err diff --git a/pkg/discoveryregistry/zookeeper/debug.go b/pkg/discoveryregistry/zookeeper/debug.go index acfae7cc5..5fabc0dec 100644 --- a/pkg/discoveryregistry/zookeeper/debug.go +++ b/pkg/discoveryregistry/zookeeper/debug.go @@ -3,9 +3,10 @@ package zookeeper import ( "context" "fmt" + "strings" + "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" "google.golang.org/grpc" - "strings" ) func newClientConnInterface(cc grpc.ClientConnInterface) grpc.ClientConnInterface { diff --git a/pkg/discoveryregistry/zookeeper/discover.go b/pkg/discoveryregistry/zookeeper/discover.go index fc547318a..c7b1d5473 100644 --- a/pkg/discoveryregistry/zookeeper/discover.go +++ b/pkg/discoveryregistry/zookeeper/discover.go @@ -44,10 +44,6 @@ func (s *ZkClient) watch() { func (s *ZkClient) GetConnsRemote(serviceName string) (conns []resolver.Address, err error) { path := s.getPath(serviceName) - _, _, _, err = s.conn.ChildrenW(path) - if err != nil { - return nil, errors.Wrap(err, "children watch error") - } childNodes, _, err := s.conn.Children(path) if err != nil { return nil, errors.Wrap(err, "get children error") @@ -64,8 +60,9 @@ func (s *ZkClient) GetConnsRemote(serviceName string) (conns []resolver.Address, log.ZDebug(context.Background(), "get conns from remote", "conn", string(data)) conns = append(conns, resolver.Address{Addr: string(data), ServerName: serviceName}) } - if len(conns) == 0 { - return nil, fmt.Errorf("no conn for service %s, grpc server may not exist, local conn is %v, please check zookeeper server %v, path: %s", serviceName, s.localConns, s.zkServers, s.zkRoot) + _, _, _, err = s.conn.ChildrenW(path) + if err != nil { + return nil, errors.Wrap(err, "children watch error") } return conns, nil } @@ -83,6 +80,9 @@ func (s *ZkClient) GetConns(ctx context.Context, serviceName string, opts ...grp s.lock.Unlock() return nil, err } + if len(conns) == 0 { + return nil, fmt.Errorf("no conn for service %s, grpc server may not exist, local conn is %v, please check zookeeper server %v, path: %s", serviceName, s.localConns, s.zkServers, s.zkRoot) + } s.localConns[serviceName] = conns } s.lock.Unlock() diff --git a/pkg/discoveryregistry/zookeeper/resolver.go b/pkg/discoveryregistry/zookeeper/resolver.go index 85e4bde48..f41666e15 100644 --- a/pkg/discoveryregistry/zookeeper/resolver.go +++ b/pkg/discoveryregistry/zookeeper/resolver.go @@ -22,7 +22,6 @@ func (r *Resolver) ResolveNow(o resolver.ResolveNowOptions) { newConns, err := r.getConnsRemote(strings.TrimLeft(r.target.URL.Path, "/")) if err != nil { log.ZError(context.Background(), "resolve now error", err, "target", r.target) - // r.ResolveNow(o) return } r.addrs = newConns