mirror of
https://github.com/minio/minio.git
synced 2024-12-24 06:05:55 -05:00
Use custom transport for site replication (#14391)
Also, ensure that tiering uses a different instance of custom transport
This commit is contained in:
parent
5dcf1d13a9
commit
4ea7bf0510
@ -20,13 +20,11 @@ package cmd
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"crypto/tls"
|
||||
"encoding/base64"
|
||||
"encoding/json"
|
||||
"encoding/xml"
|
||||
"errors"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"reflect"
|
||||
"sort"
|
||||
@ -2040,26 +2038,13 @@ func (c *SiteReplicationSys) RemoveRemoteTargetsForEndpoint(ctx context.Context,
|
||||
|
||||
// Other helpers
|
||||
|
||||
// newRemoteClusterHTTPTransport returns a new http configuration
|
||||
// used while communicating with the remote cluster.
|
||||
func newRemoteClusterHTTPTransport() *http.Transport {
|
||||
tr := &http.Transport{
|
||||
Proxy: http.ProxyFromEnvironment,
|
||||
TLSClientConfig: &tls.Config{
|
||||
RootCAs: globalRootCAs,
|
||||
ClientSessionCache: tls.NewLRUClientSessionCache(tlsClientSessionCacheSize),
|
||||
},
|
||||
}
|
||||
return tr
|
||||
}
|
||||
|
||||
func getAdminClient(endpoint, accessKey, secretKey string) (*madmin.AdminClient, error) {
|
||||
epURL, _ := url.Parse(endpoint)
|
||||
client, err := madmin.New(epURL.Host, accessKey, secretKey, epURL.Scheme == "https")
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
client.SetCustomTransport(newRemoteClusterHTTPTransport())
|
||||
client.SetCustomTransport(NewRemoteTargetHTTPTransport())
|
||||
return client, nil
|
||||
}
|
||||
|
||||
@ -2071,7 +2056,7 @@ func getS3Client(pc madmin.PeerSite) (*minioClient.Client, error) {
|
||||
return minioClient.New(ep.Host, &minioClient.Options{
|
||||
Creds: credentials.NewStaticV4(pc.AccessKey, pc.SecretKey, ""),
|
||||
Secure: ep.Scheme == "https",
|
||||
Transport: newRemoteClusterHTTPTransport(),
|
||||
Transport: NewRemoteTargetHTTPTransport(),
|
||||
})
|
||||
}
|
||||
|
||||
|
@ -21,8 +21,10 @@ import (
|
||||
"context"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/minio/madmin-go"
|
||||
@ -31,6 +33,12 @@ import (
|
||||
"github.com/minio/minio-go/v7/pkg/credentials"
|
||||
)
|
||||
|
||||
// getRemoteTierTargetInstanceTransport contains a singleton roundtripper.
|
||||
var (
|
||||
getRemoteTierTargetInstanceTransport http.RoundTripper
|
||||
getRemoteTierTargetInstanceTransportOnce sync.Once
|
||||
)
|
||||
|
||||
type warmBackendS3 struct {
|
||||
client *minio.Client
|
||||
core *minio.Core
|
||||
@ -109,13 +117,13 @@ func newWarmBackendS3(conf madmin.TierS3) (*warmBackendS3, error) {
|
||||
} else {
|
||||
creds = credentials.NewStaticV4(conf.AccessKey, conf.SecretKey, "")
|
||||
}
|
||||
getRemoteTargetInstanceTransportOnce.Do(func() {
|
||||
getRemoteTargetInstanceTransport = newGatewayHTTPTransport(10 * time.Minute)
|
||||
getRemoteTierTargetInstanceTransportOnce.Do(func() {
|
||||
getRemoteTierTargetInstanceTransport = newGatewayHTTPTransport(10 * time.Minute)
|
||||
})
|
||||
opts := &minio.Options{
|
||||
Creds: creds,
|
||||
Secure: u.Scheme == "https",
|
||||
Transport: getRemoteTargetInstanceTransport,
|
||||
Transport: getRemoteTierTargetInstanceTransport,
|
||||
}
|
||||
client, err := minio.New(u.Host, opts)
|
||||
if err != nil {
|
||||
|
Loading…
Reference in New Issue
Block a user