Merge branch 'master' of https://github.com/erda-project/erda

Author: kakj-go

modules/extensions/loghub/index/query/clients.go

@@ -262,7 +262,7 @@ func newHTTPClient(clusterName string) *http.Client {
 			Proxy:                 http.ProxyFromEnvironment,
 			DialContext:           t.DialContext,
 			ForceAttemptHTTP2:     true,
-			MaxIdleConns:          100,
+			MaxIdleConns:          -1,
 			IdleConnTimeout:       90 * time.Second,
 			TLSHandshakeTimeout:   10 * time.Second,
 			ExpectContinueTimeout: 1 * time.Second,

pkg/http/httpclient/client.go

@@ -34,13 +34,6 @@ import (
 	"github.com/erda-project/erda/pkg/clusterdialer"
 )
 
-const (
-	// DialTimeout 建立 tcp 连接的超时时间
-	DialTimeout = 15 * time.Second
-	// ClientDefaultTimeout 从建立 tcp 到读完 response body 超时时间
-	ClientDefaultTimeout = 60 * time.Second
-)
-
 type BasicAuth struct {
 	name     string
 	password string
@@ -202,16 +195,40 @@ func WithEnableAutoRetry(enableAutoRetry bool) OpOption {
 	}
 }
 
-func mkDialContext(option *Option) func(ctx context.Context, network, addr string) (net.Conn, error) {
-	raw := (&net.Dialer{
-		Timeout:   option.dialTimeout,
-		KeepAlive: option.dialerKeepalive,
+var defaultTransport = newdefaultTransport(newDialContext(0, 0))
+
+func newDialContext(dialTimeout, tcpKeepAlive time.Duration) func(ctx context.Context, network, addr string) (net.Conn, error) {
+	if dialTimeout == 0 {
+		dialTimeout = 15 * time.Second
+	}
+	if tcpKeepAlive == 0 {
+		tcpKeepAlive = 60 * time.Second
+	}
+	return (&net.Dialer{
+		Timeout:   dialTimeout,
+		KeepAlive: tcpKeepAlive,
 	}).DialContext
+}
+
+func newdefaultTransport(dialContext func(ctx context.Context, network, addr string) (net.Conn, error)) *http.Transport {
+	return &http.Transport{
+		DialContext:           dialContext,
+		Proxy:                 http.ProxyFromEnvironment,
+		ForceAttemptHTTP2:     false,
+		MaxIdleConns:          10,
+		IdleConnTimeout:       90 * time.Second,
+		TLSHandshakeTimeout:   10 * time.Second,
+		ExpectContinueTimeout: 1 * time.Second,
+	}
+}
+
+func mkDialContext(clusterDialKey string, dnscache *DNSCache, dialTimeout, tcpKeepAlive time.Duration) func(ctx context.Context, network, addr string) (net.Conn, error) {
+	raw := newDialContext(dialTimeout, tcpKeepAlive)
 	dialcontext := raw
-	if option.clusterDialKey != "" {
-		return clusterdialer.DialContext(option.clusterDialKey)
+	if clusterDialKey != "" {
+		return clusterdialer.DialContext(clusterDialKey)
 	}
-	if option.dnscache != nil {
+	if dnscache != nil {
 		dialcontext = func(ctx context.Context, network, addr string) (net.Conn, error) {
 			var host string
 			var remain string
@@ -231,7 +248,7 @@ func mkDialContext(option *Option) func(ctx context.Context, network, addr strin
 			if net.ParseIP(host) != nil || (!strings.HasPrefix(network, "tcp") && !strings.HasPrefix(network, "udp")) {
 				return raw(ctx, network, addr)
 			}
-			ips, err := option.dnscache.lookup(host)
+			ips, err := dnscache.lookup(host)
 			if err != nil {
 				return raw(ctx, network, addr)
 			}
@@ -250,37 +267,39 @@ func mkDialContext(option *Option) func(ctx context.Context, network, addr strin
 
 func New(ops ...OpOption) *HTTPClient {
 	option := &Option{}
-	option.dialTimeout = DialTimeout
-	option.clientTimeout = ClientDefaultTimeout
 	for _, op := range ops {
 		op(option)
 	}
 
-	tr := &http.Transport{
-		DialContext:  mkDialContext(option),
-		MaxIdleConns: 2,
-	}
-	if option.proxy != "" {
-		tr.Proxy = func(request *http.Request) (u *url.URL, err error) {
-			return url.Parse(option.proxy)
-		}
-	}
-	if option.dialerKeepalive != 0 {
-		tr.IdleConnTimeout = option.dialerKeepalive
-	}
-	tr.ExpectContinueTimeout = 1 * time.Second
 	proto := "http"
 	if option.isHTTPS {
 		proto = "https"
-		if option.ca != nil {
-			tr.TLSClientConfig = &tls.Config{
-				RootCAs:      option.ca,
-				Certificates: []tls.Certificate{option.keyPair},
+	}
+
+	var tr = defaultTransport
+	if option.clusterDialKey != "" || option.dnscache != nil || option.dialTimeout != 0 || option.clientTimeout != 0 ||
+		option.proxy != "" || option.dialerKeepalive != 0 || option.ca != nil {
+		tr = newdefaultTransport(mkDialContext(option.clusterDialKey, option.dnscache, option.dialTimeout, option.clientTimeout))
+		tr.MaxIdleConns = -1 // disable connection pool
+		if option.proxy != "" {
+			tr.Proxy = func(request *http.Request) (u *url.URL, err error) {
+				return url.Parse(option.proxy)
 			}
-		} else {
-			tr.TLSClientConfig = &tls.Config{
-				InsecureSkipVerify: true,
-				Certificates:       []tls.Certificate{option.keyPair},
+		}
+		if option.dialerKeepalive != 0 {
+			tr.IdleConnTimeout = option.dialerKeepalive
+		}
+		if option.isHTTPS {
+			if option.ca != nil {
+				tr.TLSClientConfig = &tls.Config{
+					RootCAs:      option.ca,
+					Certificates: []tls.Certificate{option.keyPair},
+				}
+			} else {
+				tr.TLSClientConfig = &tls.Config{
+					InsecureSkipVerify: true,
+					Certificates:       []tls.Certificate{option.keyPair},
+				}
 			}
 		}
 	}

pkg/http/httpclient/request.go

@@ -201,6 +201,7 @@ func (r AfterDo) JSON(o interface{}) (*Response, error) {
 		return nil, err
 	}
 	defer resp.Body.Close()
+
 	// check content-type before decode body
 	contentType := resp.Header.Get("Content-Type")
 	body, err := ioutil.ReadAll(resp.Body)

pkg/http/httpclient/trace.go

@@ -47,6 +47,7 @@ func (t *DefaultTracer) TraceResponse(r *http.Response) {
 		io.WriteString(t.w, fmt.Sprintf("TraceResponse: read response body fail: %v", err))
 		return
 	}
+	r.Body.Close()
 	io.WriteString(t.w, fmt.Sprintf("ResponseBody: %s\n", string(body)))
 	r.Body = ioutil.NopCloser(bytes.NewReader(body))
 }

quick-start/env

@@ -143,7 +143,7 @@ MASTER_VIP_URL=https://172.21.0.1:443
 LB_ADDR=10.0.7.7:80
 
 IS_FDP_CLUSTER=true
-DICE_VERSION=1.2.1
+DICE_VERSION=1.3.1
 DICE_PROTOCOL=http
 DICE_SSH_USER=root
 DICE_INSIDE=false

quick-start/nginx.conf

@@ -60,4 +60,13 @@ server {
    proxy_cache_bypass $http_upgrade;
    proxy_redirect off;
  }
+}
+
+server {
+ listen 80;
+ server_name erda.local;
+
+ location / {
+   return 301 http://one.erda.local;
+ }
 }

quick-start/quick-start.sh

@@ -210,6 +210,6 @@ ohai "Erda has been started successfully using ${INSTALL_LOCATION}/quick-start/d
 
 ohai "Next steps:"
 echo "visit ${tty_underline}http://erda.local${tty_reset} to start your journey on Erda"
-echo "visit ${tty_underline}https://docs.erda.cloud/1.2/manual/install/docker-install.html${tty_reset} for FAQs if you encounter problems installing Erda"
+echo "visit ${tty_underline}https://docs.erda.cloud/1.3/manual/install/docker-install.html${tty_reset} for FAQs if you encounter problems installing Erda"
 echo "visit ${tty_underline}https://docs.erda.cloud${tty_reset} for full introduction of Erda"
 echo "goto ${INSTALL_LOCATION}/quick-start/ dir to check and manage the docker-compose resources"