Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use custom roundtripper in the minio client #323

Merged
merged 2 commits into from
May 7, 2018
Merged

Use custom roundtripper in the minio client #323

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1d00e6
Use custom roundtripper in the minio client
alvaroaleman May 6, 2018
f99fb56
Add a comment explaining why ResponseHeaderTimeout is needed
alvaroaleman May 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion pkg/objstore/s3/s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@ import (
"context"
"fmt"
"io"
"net"
"net/http"
"os"
"runtime"
"strings"
"time"

"github.com/minio/minio-go"
"github.com/pkg/errors"
Expand Down Expand Up @@ -89,10 +92,33 @@ func NewBucket(conf *Config, reg prometheus.Registerer, component string) (*Buck
}

client, err := f(conf.Endpoint, conf.AccessKey, conf.SecretKey, !conf.Insecure)
client.SetAppInfo(fmt.Sprintf("thanos-%s", component), fmt.Sprintf("%s (%s)", version.Version, runtime.Version()))
if err != nil {
return nil, errors.Wrap(err, "initialize s3 client")
}
client.SetAppInfo(fmt.Sprintf("thanos-%s", component), fmt.Sprintf("%s (%s)", version.Version, runtime.Version()))
client.SetCustomTransport(&http.Transport{
Proxy: http.ProxyFromEnvironment,
DialContext: (&net.Dialer{
Timeout: 30 * time.Second,
KeepAlive: 30 * time.Second,
DualStack: true,
}).DialContext,
MaxIdleConns: 100,
IdleConnTimeout: 90 * time.Second,
TLSHandshakeTimeout: 10 * time.Second,
ExpectContinueTimeout: 1 * time.Second,
// The ResponseHeaderTimeout here is the only change from the
// default minio transport, it was introduced to cover cases
// where the tcp connection works but the server never answers
ResponseHeaderTimeout: 15 * time.Second,
// Set this value so that the underlying transport round-tripper
// doesn't try to auto decode the body of objects with
// content-encoding set to `gzip`.
//
// Refer:
// https://golang.org/src/net/http/transport.go?h=roundTrip#L1843
DisableCompression: true,
})

bkt := &Bucket{
bucket: conf.Bucket,
Expand Down