RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix/unify context-based remote storage timeouts

This commit is contained in:
Julius Volz 2017-03-20 14:17:06 +01:00
parent 815762a4ad
commit 9b33cfc457
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
storage/remote/client.go
View File

@ -101,7 +101,9 @@ func (c *Client) Store(samples model.Samples) error {
} }
httpReq.Header.Add("Content-Encoding", "snappy") httpReq.Header.Add("Content-Encoding", "snappy")
ctx, _ := context.WithTimeout(context.Background(), c.timeout) ctx, cancel := context.WithTimeout(context.Background(), c.timeout)
defer cancel()
httpResp, err := ctxhttp.Do(ctx, c.client, httpReq) httpResp, err := ctxhttp.Do(ctx, c.client, httpReq)
if err != nil { if err != nil {
return err return err
@ -144,6 +146,10 @@ func (c *Client) Read(ctx context.Context, from, through model.Time, matchers me
if err != nil { if err != nil {
return nil, fmt.Errorf("unable to create request: %v", err) return nil, fmt.Errorf("unable to create request: %v", err)
} }
ctx, cancel := context.WithTimeout(ctx, c.timeout)
defer cancel()
httpResp, err := ctxhttp.Do(ctx, c.client, httpReq) httpResp, err := ctxhttp.Do(ctx, c.client, httpReq)
if err != nil { if err != nil {
return nil, fmt.Errorf("error sending request: %v", err) return nil, fmt.Errorf("error sending request: %v", err)