From 0eb185840840c0dc3c5eef03e01c61e22662e607 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 29 Jun 2023 22:54:24 +0800 Subject: [PATCH] conn --- pkg/common/mw/rpc_client_interceptor.go | 2 ++ pkg/discoveryregistry/zookeeper/resolver.go | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/pkg/common/mw/rpc_client_interceptor.go b/pkg/common/mw/rpc_client_interceptor.go index 498dfd9b8..2ac627e79 100644 --- a/pkg/common/mw/rpc_client_interceptor.go +++ b/pkg/common/mw/rpc_client_interceptor.go @@ -5,6 +5,7 @@ import ( "errors" "fmt" "strings" + "time" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/log" @@ -53,6 +54,7 @@ func RpcClientInterceptor(ctx context.Context, method string, req, resp interfac } func getRpcContext(ctx context.Context, method string) (context.Context, error) { + ctx, _ = context.WithTimeout(ctx, time.Second*5) md := metadata.Pairs() if keys, _ := ctx.Value(constant.RpcCustomHeader).([]string); len(keys) > 0 { for _, key := range keys { diff --git a/pkg/discoveryregistry/zookeeper/resolver.go b/pkg/discoveryregistry/zookeeper/resolver.go index ea1e13dfc..57e0f5db7 100644 --- a/pkg/discoveryregistry/zookeeper/resolver.go +++ b/pkg/discoveryregistry/zookeeper/resolver.go @@ -25,6 +25,10 @@ func (r *Resolver) ResolveNowZK(o resolver.ResolveNowOptions) { return } r.addrs = newConns + if len(newConns) == 0 { + log.ZError(context.Background(), "conn is nil", nil) + return + } if err := r.cc.UpdateState(resolver.State{Addresses: newConns}); err != nil { log.ZError(context.Background(), "UpdateState error, conns is nil from svr", err, "conns", newConns, "zk path", r.target.URL.Path) return