Skip to content

objstore: Increase the response header timeout in the S3 provider to 2 minutes and make it configurable #1094

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

Merged
GiedriusS merged 10 commits into from
May 16, 2019
Merged

objstore: Increase the response header timeout in the S3 provider to 2 minutes and make it configurable #1094

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
701c9a0
Increase the response header timeout
antonio Apr 25, 2019
08fc6cb
Format
antonio May 14, 2019
48268e9
Make response header timeout configurable
antonio May 14, 2019
d6e1ab7
Test default values for the HTTPConfig struct
antonio May 14, 2019
cfab9d9
Document new feature in the changelog
antonio May 14, 2019
c90dbcc
Add explanation for new option and refactor existing documentation
antonio May 14, 2019
0fe53e0
Run make docs
antonio May 14, 2019
60f8483
Typo
antonio May 14, 2019
67bf935
Merge branch 'master' into increase-response-header-timeout
antonio May 16, 2019
2eaff03
Remove redundant blank line
antonio May 16, 2019
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
Prev Previous commit
Next Next commit
Test default values for the HTTPConfig struct
  • Loading branch information
@antonio
antonio committed May 14, 2019
commit d6e1ab7294342a408ebfc8bad494cc7a02f04d4a
49 changes: 42 additions & 7 deletions pkg/objstore/s3/s3_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,48 @@ import (
"github.com/improbable-eng/thanos/pkg/testutil"
)

func TestParseConfig_DefaultHTTPOpts(t *testing.T) {
func TestParseConfig(t *testing.T) {
input := []byte(`bucket: abcd
insecure: false`)
cfg, err := parseConfig(input)
testutil.Ok(t, err)

if cfg.Bucket != "abcd" {
t.Errorf("parsing of bucket failed: got %v, expected %v", cfg.Bucket, "abcd")
}
if cfg.Insecure {
t.Errorf("parsing of insecure failed: got %v, expected %v", cfg.Insecure, false)
}
}

func TestParseConfig_DefaultHTTPConfig(t *testing.T) {
input := []byte(`bucket: abcd
insecure: false`)
cfg, err := parseConfig(input)
testutil.Ok(t, err)

if time.Duration(cfg.HTTPConfig.IdleConnTimeout) != time.Duration(90*time.Second) {
t.Errorf("parsing of idle_conn_timeout failed: got %v, expected %v",
time.Duration(cfg.HTTPConfig.IdleConnTimeout), time.Duration(90*time.Second))
}

if time.Duration(cfg.HTTPConfig.ResponseHeaderTimeout) != time.Duration(2*time.Minute) {
t.Errorf("parsing of response_header_timeout failed: got %v, expected %v",
time.Duration(cfg.HTTPConfig.IdleConnTimeout), time.Duration(2*time.Minute))
}

if cfg.HTTPConfig.InsecureSkipVerify {
t.Errorf("parsing of insecure_skip_verify failed: got %v, expected %v", cfg.HTTPConfig.InsecureSkipVerify, false)
}
}

func TestParseConfig_CustomHTTPConfig(t *testing.T) {
input := []byte(`bucket: abcd
insecure: false
http_config:
insecure_skip_verify: true
idle_conn_timeout: 50s`)
idle_conn_timeout: 50s
response_header_timeout: 1m`)
cfg, err := parseConfig(input)
testutil.Ok(t, err)

Expand All @@ -21,12 +57,11 @@ http_config:
time.Duration(cfg.HTTPConfig.IdleConnTimeout), time.Duration(50*time.Second))
}

if cfg.Bucket != "abcd" {
t.Errorf("parsing of bucket failed: got %v, expected %v", cfg.Bucket, "abcd")
}
if cfg.Insecure {
t.Errorf("parsing of insecure failed: got %v, expected %v", cfg.Insecure, false)
if time.Duration(cfg.HTTPConfig.ResponseHeaderTimeout) != time.Duration(1*time.Minute) {
t.Errorf("parsing of response_header_timeout failed: got %v, expected %v",
time.Duration(cfg.HTTPConfig.IdleConnTimeout), time.Duration(1*time.Minute))
}

if !cfg.HTTPConfig.InsecureSkipVerify {
t.Errorf("parsing of insecure_skip_verify failed: got %v, expected %v", cfg.HTTPConfig.InsecureSkipVerify, false)
}
Expand Down