Merge branch 'develop' into urbs

teambition · Apr 9, 2020 · 92204b8 · 92204b8
2 parents 52aad6e + b0c2c8c
commit 92204b8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/pkg/middlewares/canary/label.go b/pkg/middlewares/canary/label.go
@@ -112,7 +112,9 @@ func (s *LabelStore) mustLoadEntry(key string, now time.Time) *entry {
 	s.mu.RLock()
 	e, ok := s.liveMap[key]
 	s.mu.RUnlock()
-	if ok && len(s.liveMap) <= s.maxCacheSize {
+
+	shouldRound := len(s.liveMap) > s.maxCacheSize || s.shouldRound.Before(now)
+	if ok && !shouldRound {
 		return e
 	}
 
@@ -127,12 +129,12 @@ func (s *LabelStore) mustLoadEntry(key string, now time.Time) *entry {
 		}
 	}
 
-	if !ok {
+	if !ok || e == nil {
 		e = &entry{}
 		s.liveMap[key] = e
 	}
 
-	if len(s.liveMap) > s.maxCacheSize || s.shouldRound.Before(now) {
+	if shouldRound {
 		s.logger.Infof("Round cache, stale cache size: %d, live cache size: %d", len(s.staleMap), len(s.liveMap))
 		s.shouldRound = now.Add(s.cacheCleanDuration)
 		// make a round: drop staleMap and create new liveMap

diff --git a/pkg/middlewares/canary/request.go b/pkg/middlewares/canary/request.go
@@ -8,6 +8,7 @@ import (
 	"io/ioutil"
 	"net"
 	"net/http"
+	"net/url"
 	"os"
 	"runtime"
 	"sync/atomic"
@@ -88,12 +89,12 @@ type labelsRes struct {
 	Result    []Label `json:"result"`    // 空数组也保留
 }
 
-func getUserLabels(ctx context.Context, url, xRequestID string) (*labelsRes, error) {
+func getUserLabels(ctx context.Context, api, xRequestID string) (*labelsRes, error) {
 	if ctx.Err() != nil {
 		return nil, nil
 	}
 
-	req, err := http.NewRequestWithContext(ctx, "GET", url, nil)
+	req, err := http.NewRequestWithContext(ctx, "GET", api, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -115,7 +116,7 @@ func getUserLabels(ctx context.Context, url, xRequestID string) (*labelsRes, err
 	req.Header.Set(headerXRequestID, xRequestID)
 	resp, err := client.Do(req)
 	if err != nil {
-		if err == context.Canceled {
+		if err.(*url.Error).Unwrap() == context.Canceled {
 			return nil, nil
 		}
 
@@ -144,12 +145,12 @@ func getUserLabels(ctx context.Context, url, xRequestID string) (*labelsRes, err
 }
 
 // MustGetUserLabels returns labels and timestamp
-func MustGetUserLabels(ctx context.Context, url, xRequestID string, logger log.Logger) ([]Label, int64) {
+func MustGetUserLabels(ctx context.Context, api, xRequestID string, logger log.Logger) ([]Label, int64) {
 	ts := time.Now().UTC().Unix()
 	rs := []Label{}
 
 	if hc.MaybeHealthy() {
-		if res, err := getUserLabels(ctx, url, xRequestID); err != nil {
+		if res, err := getUserLabels(ctx, api, xRequestID); err != nil {
 			logger.Error(err)
 		} else if res != nil {
 			rs = res.Result