mirror of
https://github.com/minio/minio.git
synced 2025-01-12 15:33:22 -05:00
Add support of TCP fast open in internode calls (#9486)
This commit is contained in:
parent
a1de9cec58
commit
6d76efb9bb
53
cmd/http/dial_linux.go
Normal file
53
cmd/http/dial_linux.go
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
// +build linux
|
||||||
|
|
||||||
|
/*
|
||||||
|
* MinIO Cloud Storage, (C) 2020 MinIO, Inc.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package http
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net"
|
||||||
|
"syscall"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
// TCPFastOpenConnect sets the underlying socket to use
|
||||||
|
// the TCP fast open connect. This feature is supported
|
||||||
|
// since Linux 4.11.
|
||||||
|
TCPFastOpenConnect = 30
|
||||||
|
)
|
||||||
|
|
||||||
|
// DialContext is a function to make custom Dial for internode communications
|
||||||
|
type DialContext func(ctx context.Context, network, address string) (net.Conn, error)
|
||||||
|
|
||||||
|
// NewCustomDialContext setups a custom dialer for internode communications
|
||||||
|
func NewCustomDialContext(dialTimeout, dialKeepAlive time.Duration) DialContext {
|
||||||
|
return func(ctx context.Context, network, addr string) (net.Conn, error) {
|
||||||
|
dialer := &net.Dialer{
|
||||||
|
Timeout: dialTimeout,
|
||||||
|
KeepAlive: dialKeepAlive,
|
||||||
|
Control: func(network, address string, c syscall.RawConn) error {
|
||||||
|
return c.Control(func(fd uintptr) {
|
||||||
|
// Enable TCP fast connect
|
||||||
|
_ = syscall.SetsockoptInt(int(fd), syscall.IPPROTO_TCP, TCPFastOpenConnect, 1)
|
||||||
|
})
|
||||||
|
},
|
||||||
|
}
|
||||||
|
return dialer.DialContext(ctx, network, addr)
|
||||||
|
}
|
||||||
|
}
|
39
cmd/http/dial_others.go
Normal file
39
cmd/http/dial_others.go
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
// +build !linux
|
||||||
|
|
||||||
|
/*
|
||||||
|
* MinIO Cloud Storage, (C) 2020 MinIO, Inc.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package http
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"net"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
// DialContext is a function to make custom Dial for internode communications
|
||||||
|
type DialContext func(ctx context.Context, network, address string) (net.Conn, error)
|
||||||
|
|
||||||
|
// NewCustomDialContext configures a custom dialer for internode communications
|
||||||
|
func NewCustomDialContext(dialTimeout, dialKeepAlive time.Duration) DialContext {
|
||||||
|
return func(ctx context.Context, network, addr string) (net.Conn, error) {
|
||||||
|
dialer := &net.Dialer{
|
||||||
|
Timeout: dialTimeout,
|
||||||
|
KeepAlive: dialKeepAlive,
|
||||||
|
}
|
||||||
|
return dialer.DialContext(ctx, network, addr)
|
||||||
|
}
|
||||||
|
}
|
16
cmd/utils.go
16
cmd/utils.go
@ -27,7 +27,6 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"net"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
"os"
|
"os"
|
||||||
@ -450,25 +449,12 @@ func ToS3ETag(etag string) string {
|
|||||||
return etag
|
return etag
|
||||||
}
|
}
|
||||||
|
|
||||||
type dialContext func(ctx context.Context, network, address string) (net.Conn, error)
|
|
||||||
|
|
||||||
func newCustomDialContext(dialTimeout, dialKeepAlive time.Duration) dialContext {
|
|
||||||
return func(ctx context.Context, network, addr string) (net.Conn, error) {
|
|
||||||
dialer := &net.Dialer{
|
|
||||||
Timeout: dialTimeout,
|
|
||||||
KeepAlive: dialKeepAlive,
|
|
||||||
}
|
|
||||||
|
|
||||||
return dialer.DialContext(ctx, network, addr)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func newCustomHTTPTransport(tlsConfig *tls.Config, dialTimeout time.Duration) func() *http.Transport {
|
func newCustomHTTPTransport(tlsConfig *tls.Config, dialTimeout time.Duration) func() *http.Transport {
|
||||||
// For more details about various values used here refer
|
// For more details about various values used here refer
|
||||||
// https://golang.org/pkg/net/http/#Transport documentation
|
// https://golang.org/pkg/net/http/#Transport documentation
|
||||||
tr := &http.Transport{
|
tr := &http.Transport{
|
||||||
Proxy: http.ProxyFromEnvironment,
|
Proxy: http.ProxyFromEnvironment,
|
||||||
DialContext: newCustomDialContext(dialTimeout, 15*time.Second),
|
DialContext: xhttp.NewCustomDialContext(dialTimeout, 15*time.Second),
|
||||||
MaxIdleConnsPerHost: 16,
|
MaxIdleConnsPerHost: 16,
|
||||||
MaxIdleConns: 16,
|
MaxIdleConns: 16,
|
||||||
IdleConnTimeout: 1 * time.Minute,
|
IdleConnTimeout: 1 * time.Minute,
|
||||||
|
Loading…
Reference in New Issue
Block a user