Merge pull request #40 from VincentYe123/fix-client-conn

Fix excessive client connection creation

builder.go

@@ -167,7 +167,7 @@ func (b *kubeBuilder) Build(target resolver.Target, cc resolver.ClientConn, opts
 		if err != nil && err != io.EOF {
 			grpclog.Errorf("kuberesolver: watching ended with error='%v', will reconnect again", err)
 		}
-	}, time.Second, ctx.Done())
+	}, time.Second, time.Second*30, ctx.Done())
 	return r, nil
 }
 
@@ -278,7 +278,7 @@ func (k *kResolver) watch() error {
 		case <-k.t.C:
 			k.resolve()
 		case <-k.rn:
-			k.resolve()
+			//k.resolve()
 		case up, hasMore := <-sw.ResultChan():
 			if hasMore {
 				k.handle(up.Object)

builder_test.go

@@ -55,17 +55,17 @@ func TestBuilder(t *testing.T) {
 	fc := &fakeConn{
 		cmp: make(chan struct{}),
 	}
-	rs, err := bl.Build(parseTarget("kubernetes://kube-dns.kube-system:53"), fc, resolver.BuildOptions{})
+	_, err = bl.Build(parseTarget("kubernetes://kube-dns.kube-system:53"), fc, resolver.BuildOptions{})
 	if err != nil {
 		t.Fatal(err)
 	}
 	<-fc.cmp
 	if len(fc.found) == 0 {
 		t.Fatal("could not found endpoints")
 	}
-	fmt.Printf("ResolveNow \n")
-	rs.ResolveNow(resolver.ResolveNowOptions{})
-	<-fc.cmp
+// 	fmt.Printf("ResolveNow \n")
+// 	rs.ResolveNow(resolver.ResolveNowOptions{})
+// 	<-fc.cmp
 
 }
 

util.go

@@ -7,12 +7,13 @@ import (
 	"google.golang.org/grpc/grpclog"
 )
 
-func until(f func(), period time.Duration, stopCh <-chan struct{}) {
+func until(f func(), initialPeriod, maxPeriod time.Duration, stopCh <-chan struct{}) {
 	select {
 	case <-stopCh:
 		return
 	default:
 	}
+	period := initialPeriod
 	for {
 		func() {
 			defer handleCrash()
@@ -22,6 +23,11 @@ func until(f func(), period time.Duration, stopCh <-chan struct{}) {
 		case <-stopCh:
 			return
 		case <-time.After(period):
+			if period*2 <= maxPeriod {
+				period *= 2
+			} else {
+				period = initialPeriod
+			}
 		}
 	}
 }