From be68ab9b4cb5ac468bc9a1a48791925ffd063f99 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Fri, 30 Jun 2023 12:42:09 +0800 Subject: [PATCH 1/3] test: grpc add timeout --- pkg/discoveryregistry/zookeeper/resolver.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/discoveryregistry/zookeeper/resolver.go b/pkg/discoveryregistry/zookeeper/resolver.go index 7792a6624..ff0e7b32c 100644 --- a/pkg/discoveryregistry/zookeeper/resolver.go +++ b/pkg/discoveryregistry/zookeeper/resolver.go @@ -18,7 +18,7 @@ type Resolver struct { } func (r *Resolver) ResolveNowZK(o resolver.ResolveNowOptions) { - log.ZDebug(context.Background(), "start resolve now", "target", r.target, "cc", r.cc) + log.ZDebug(context.Background(), "start resolve now", "target", r.target, "cc", r.cc.UpdateState) newConns, err := r.getConnsRemote(strings.TrimLeft(r.target.URL.Path, "/")) if err != nil { log.ZError(context.Background(), "resolve now error", err, "target", r.target) @@ -37,7 +37,8 @@ func (r *Resolver) ResolveNow(o resolver.ResolveNowOptions) {} func (s *Resolver) Close() {} func (s *ZkClient) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOptions) (resolver.Resolver, error) { - s.logger.Printf("build resolver: %+v, cc: %+v", "target", target, "cc", cc) + //s.logger.Printf("build resolver: %+v, cc: %+v", "target", target, "cc", cc.UpdateState()) + log.ZDebug(context.Background(), "build resolver start", "target", target, "cc", cc.UpdateState) r := &Resolver{} r.target = target r.cc = cc From ccbacc283a95330740542f2a6ba13e4e6a72640e Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Fri, 30 Jun 2023 12:45:12 +0800 Subject: [PATCH 2/3] test: grpc add timeout --- pkg/discoveryregistry/zookeeper/resolver.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/discoveryregistry/zookeeper/resolver.go b/pkg/discoveryregistry/zookeeper/resolver.go index cf214e714..50e01f218 100644 --- a/pkg/discoveryregistry/zookeeper/resolver.go +++ b/pkg/discoveryregistry/zookeeper/resolver.go @@ -18,7 +18,7 @@ type Resolver struct { } func (r *Resolver) ResolveNowZK(o resolver.ResolveNowOptions) { - log.ZDebug(context.Background(), "start resolve now", "target", r.target, "cc", r.cc.UpdateState) + log.ZDebug(context.Background(), "start resolve now", "target", r.target, "cc", r.cc.UpdateState, "serviceName", strings.TrimLeft(r.target.URL.Path, "/")) newConns, err := r.getConnsRemote(strings.TrimLeft(r.target.URL.Path, "/")) if err != nil { log.ZError(context.Background(), "resolve now error", err, "target", r.target) @@ -49,6 +49,7 @@ func (s *ZkClient) Build(target resolver.Target, cc resolver.ClientConn, opts re serviceName := strings.TrimLeft(target.URL.Path, "/") s.resolvers[serviceName] = r s.logger.Printf("build resolver finished: %+v, cc: %+v, key: ", target, cc, serviceName) + log.ZDebug(context.Background(), "build resolver finished", "target", target, "cc", cc.UpdateState, "serviceName", serviceName) return r, nil } From 10950fa7cffff17c30d29e6e03f9acbae75184a8 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Fri, 30 Jun 2023 12:53:53 +0800 Subject: [PATCH 3/3] test: grpc add timeout --- pkg/discoveryregistry/zookeeper/resolver.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/discoveryregistry/zookeeper/resolver.go b/pkg/discoveryregistry/zookeeper/resolver.go index 50e01f218..c973d67a0 100644 --- a/pkg/discoveryregistry/zookeeper/resolver.go +++ b/pkg/discoveryregistry/zookeeper/resolver.go @@ -2,6 +2,7 @@ package zookeeper import ( "context" + "fmt" "strings" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" @@ -19,6 +20,7 @@ type Resolver struct { func (r *Resolver) ResolveNowZK(o resolver.ResolveNowOptions) { log.ZDebug(context.Background(), "start resolve now", "target", r.target, "cc", r.cc.UpdateState, "serviceName", strings.TrimLeft(r.target.URL.Path, "/")) + fmt.Println("start resolve now", "target", r.target, "cc", r.cc.UpdateState, "serviceName", strings.TrimLeft(r.target.URL.Path, "/")) newConns, err := r.getConnsRemote(strings.TrimLeft(r.target.URL.Path, "/")) if err != nil { log.ZError(context.Background(), "resolve now error", err, "target", r.target) @@ -37,7 +39,7 @@ func (r *Resolver) ResolveNow(o resolver.ResolveNowOptions) {} func (s *Resolver) Close() {} func (s *ZkClient) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOptions) (resolver.Resolver, error) { - //s.logger.Printf("build resolver: %+v, cc: %+v", "target", target, "cc", cc.UpdateState()) + s.logger.Printf("build resolver: %+v, cc: %+v", target, cc.UpdateState) log.ZDebug(context.Background(), "build resolver start", "target", target, "cc", cc.UpdateState) r := &Resolver{} r.target = target @@ -48,7 +50,7 @@ func (s *ZkClient) Build(target resolver.Target, cc resolver.ClientConn, opts re defer s.lock.Unlock() serviceName := strings.TrimLeft(target.URL.Path, "/") s.resolvers[serviceName] = r - s.logger.Printf("build resolver finished: %+v, cc: %+v, key: ", target, cc, serviceName) + s.logger.Printf("build resolver finished: %+v, cc: %+v, key: %s", target, cc.UpdateState, serviceName) log.ZDebug(context.Background(), "build resolver finished", "target", target, "cc", cc.UpdateState, "serviceName", serviceName) return r, nil }