From 49675421d92856440ff798ecc26356eef8c1d006 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Thu, 29 Jun 2023 17:24:17 +0800 Subject: [PATCH] resolve --- pkg/discoveryregistry/zookeeper/resolver.go | 6 ++++-- pkg/discoveryregistry/zookeeper/zk.go | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/discoveryregistry/zookeeper/resolver.go b/pkg/discoveryregistry/zookeeper/resolver.go index 5d2e3b373..54e496943 100644 --- a/pkg/discoveryregistry/zookeeper/resolver.go +++ b/pkg/discoveryregistry/zookeeper/resolver.go @@ -17,7 +17,7 @@ type Resolver struct { getConnsRemote func(serviceName string) (conns []resolver.Address, err error) } -func (r *Resolver) ResolveNow(o resolver.ResolveNowOptions) { +func (r *Resolver) ResolveNowZK(o resolver.ResolveNowOptions) { log.ZDebug(context.Background(), "start resolve now", "target", r.target) newConns, err := r.getConnsRemote(strings.TrimLeft(r.target.URL.Path, "/")) if err != nil { @@ -32,6 +32,8 @@ func (r *Resolver) ResolveNow(o resolver.ResolveNowOptions) { log.ZDebug(context.Background(), "resolve now finished", "target", r.target, "conns", r.addrs) } +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) { @@ -40,7 +42,7 @@ func (s *ZkClient) Build(target resolver.Target, cc resolver.ClientConn, opts re r.target = target r.cc = cc r.getConnsRemote = s.GetConnsRemote - r.ResolveNow(resolver.ResolveNowOptions{}) + r.ResolveNowZK(resolver.ResolveNowOptions{}) s.lock.Lock() defer s.lock.Unlock() s.resolvers[strings.TrimLeft(target.URL.Path, "/")] = r diff --git a/pkg/discoveryregistry/zookeeper/zk.go b/pkg/discoveryregistry/zookeeper/zk.go index 686165b40..2b47c9f77 100644 --- a/pkg/discoveryregistry/zookeeper/zk.go +++ b/pkg/discoveryregistry/zookeeper/zk.go @@ -161,7 +161,7 @@ func (s *ZkClient) flushResolverAndDeleteLocal(serviceName string) { func (s *ZkClient) flushResolver(serviceName string) { r, ok := s.resolvers[serviceName] if ok { - r.ResolveNow(resolver.ResolveNowOptions{}) + r.ResolveNowZK(resolver.ResolveNowOptions{}) s.resolvers[serviceName] = r } }