fix http resovler bug (#1231)

* fix http resovler bug

* delete unused code

transport/http/resolver.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"net/url"
 	"sync"
+	"time"
 
 	"github.com/go-kratos/kratos/v2/log"
 	"github.com/go-kratos/kratos/v2/registry"
@@ -36,8 +37,9 @@ func parseTarget(endpoint string) (*Target, error) {
 }
 
 type resolver struct {
-	lock  sync.RWMutex
-	nodes []*registry.ServiceInstance
+	lock    sync.RWMutex
+	nodes   []*registry.ServiceInstance
+	updater Updater
 
 	target  *Target
 	watcher registry.Watcher
@@ -53,69 +55,73 @@ func newResolver(ctx context.Context, discovery registry.Discovery, target *Targ
 		target:  target,
 		watcher: watcher,
 		logger:  log.NewHelper(log.DefaultLogger),
+		updater: updater,
 	}
-	done := make(chan error, 1)
-	go func() {
-		for {
-			var executed bool
-			services, err := watcher.Next()
-			if err != nil {
-				r.logger.Errorf("http client watch service %v got unexpected error:=%v", target, err)
-				if block {
-					select {
-					case done <- err:
-					default:
-					}
-				}
-				return
-			}
-			var nodes []*registry.ServiceInstance
-			for _, in := range services {
-				_, endpoint, err := parseEndpoint(in.Endpoints)
+	if block {
+		done := make(chan error, 1)
+		go func() {
+			for {
+				services, err := watcher.Next()
 				if err != nil {
-					r.logger.Errorf("Failed to parse (%v) discovery endpoint: %v error %v", target, in.Endpoints, err)
-					continue
+					done <- err
+					return
 				}
-				if endpoint == "" {
-					continue
-				}
-				nodes = append(nodes, in)
-			}
-			if len(nodes) != 0 {
-				updater.Update(nodes)
-				r.lock.Lock()
-				r.nodes = nodes
-				r.lock.Unlock()
-				if block && !executed {
-					executed = true
+				r.update(services)
+				if len(r.nodes) > 0 {
 					done <- nil
+					return
 				}
-			} else {
-				r.logger.Warnf("[http resovler]Zero endpoint found,refused to write,ser: %s ins: %v", target.Endpoint, nodes)
 			}
-		}
-	}()
-	if block {
+		}()
 		select {
-		case e := <-done:
-			if e != nil {
+		case err := <-done:
+			if err != nil {
 				watcher.Stop()
+				return nil, err
 			}
-			return r, e
 		case <-ctx.Done():
 			r.logger.Errorf("http client watch service %v reaching context deadline!", target)
 			watcher.Stop()
 			return nil, ctx.Err()
 		}
 	}
+
+	go func() {
+		for {
+			services, err := watcher.Next()
+			if err != nil {
+				r.logger.Errorf("http client watch service %v got unexpected error:=%v", target, err)
+				time.Sleep(time.Second)
+				continue
+			}
+			r.update(services)
+		}
+	}()
+
 	return r, nil
 }
 
-func (r *resolver) fetch(ctx context.Context) []*registry.ServiceInstance {
-	r.lock.RLock()
-	nodes := r.nodes
-	r.lock.RUnlock()
-	return nodes
+func (r *resolver) update(services []*registry.ServiceInstance) {
+	var nodes []*registry.ServiceInstance
+	for _, in := range services {
+		_, endpoint, err := parseEndpoint(in.Endpoints)
+		if err != nil {
+			r.logger.Errorf("Failed to parse (%v) discovery endpoint: %v error %v", r.target, in.Endpoints, err)
+			continue
+		}
+		if endpoint == "" {
+			continue
+		}
+		nodes = append(nodes, in)
+	}
+	if len(nodes) != 0 {
+		r.updater.Update(nodes)
+		r.lock.Lock()
+		r.nodes = nodes
+		r.lock.Unlock()
+	} else {
+		r.logger.Warnf("[http resovler]Zero endpoint found,refused to write,ser: %s ins: %v", r.target.Endpoint, nodes)
+	}
 }
 
 func parseEndpoint(endpoints []string) (string, string, error) {