MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-26 06:03:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

storage: Increase the timeout of storage REST requests (#7218)

Browse Source 
This commit increases storage REST requests to 5 minutes, this includes
the opening TCP connection, and sending/receiving data. This will reduce
clients receiving errors when the server is under high load.
This commit is contained in:
Anis Elleuch 2019-02-13 08:27:33 +01:00 committed by kannappanr
parent 9f9e0fe085
commit f9fecf0e76
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/rpc.go
View File

@ -31,6 +31,12 @@ import (
// DefaultSkewTime - skew time is 15 minutes between minio peers. // DefaultSkewTime - skew time is 15 minutes between minio peers.
const DefaultSkewTime = 15 * time.Minute const DefaultSkewTime = 15 * time.Minute
// defaultRPCTimeout - default RPC timeout is one minute.
const defaultRPCTimeout = 5 * time.Minute
// defaultRPCRetryTime - default RPC time to wait before retry after a network error
const defaultRPCRetryTime = 1 * time.Minute
var errRPCRetry = fmt.Errorf("rpc: retry error") var errRPCRetry = fmt.Errorf("rpc: retry error")
func isNetError(err error) bool { func isNetError(err error) bool {
@ -217,7 +223,7 @@ func (client *RPCClient) Call(serviceMethod string, args interface {
} }
if isNetError(err) { if isNetError(err) {
client.setRetryTicker(time.NewTicker(xrpc.DefaultRPCTimeout)) client.setRetryTicker(time.NewTicker(defaultRPCRetryTime))
} else { } else {
client.setRetryTicker(nil) client.setRetryTicker(nil)
} }
@ -265,6 +271,6 @@ func NewRPCClient(args RPCClientArgs) (*RPCClient, error) {
return &RPCClient{ return &RPCClient{
args: args, args: args,
authToken: args.NewAuthTokenFunc(), authToken: args.NewAuthTokenFunc(),
rpcClient: xrpc.NewClient(args.ServiceURL, args.TLSConfig, xrpc.DefaultRPCTimeout), rpcClient: xrpc.NewClient(args.ServiceURL, args.TLSConfig, defaultRPCTimeout),
}, nil }, nil
} }

7
cmd/storage-rest-client.go
View File

@ -25,6 +25,7 @@ import (
"net/url" "net/url"
"path" "path"
"strconv" "strconv"
"time"
"encoding/gob" "encoding/gob"
"encoding/hex" "encoding/hex"
@ -38,6 +39,10 @@ import (
xnet "github.com/minio/minio/pkg/net" xnet "github.com/minio/minio/pkg/net"
) )
// The timeout of TCP connect and sending/receiving
// data for all internode storage REST requests.
const storageRESTTimeout = 5 * time.Minute
func isNetworkDisconnectError(err error) bool { func isNetworkDisconnectError(err error) bool {
if err == nil { if err == nil {
return false return false
@ -376,6 +381,6 @@ func newStorageRESTClient(endpoint Endpoint) *storageRESTClient {
} }
} }
restClient := rest.NewClient(serverURL, tlsConfig, rest.DefaultRESTTimeout, newAuthToken) restClient := rest.NewClient(serverURL, tlsConfig, storageRESTTimeout, newAuthToken)
return &storageRESTClient{endpoint: endpoint, restClient: restClient, connected: true} return &storageRESTClient{endpoint: endpoint, restClient: restClient, connected: true}
} }