From 433f3e0b1a65f2d8140f9eb157ba68c698bc1710 Mon Sep 17 00:00:00 2001 From: Doug Fawley Date: Fri, 4 Oct 2019 12:26:10 -0700 Subject: [PATCH] merge resolution --- resolver_conn_wrapper.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/resolver_conn_wrapper.go b/resolver_conn_wrapper.go index ead72259dad..b4f2a5714c8 100644 --- a/resolver_conn_wrapper.go +++ b/resolver_conn_wrapper.go @@ -24,13 +24,15 @@ import ( "sync" "time" + "google.golang.org/grpc/backoff" "google.golang.org/grpc/balancer" "google.golang.org/grpc/grpclog" - "google.golang.org/grpc/internal/backoff" "google.golang.org/grpc/internal/channelz" "google.golang.org/grpc/internal/grpcsync" "google.golang.org/grpc/resolver" "google.golang.org/grpc/serviceconfig" + + internalbackoff "google.golang.org/grpc/internal/backoff" ) // ccResolverWrapper is a wrapper on top of cc for resolvers. @@ -113,7 +115,7 @@ func (ccr *ccResolverWrapper) close() { ccr.mu.Unlock() } -var resolverBackoff = backoff.Exponential{MaxDelay: 2 * time.Minute}.Backoff +var resolverBackoff = internalbackoff.Exponential{Config: backoff.Config{MaxDelay: 2 * time.Minute}}.Backoff // poll begins or ends asynchronous polling of the resolver based on whether // err is ErrBadResolverState.