RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-26 08:33:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make series method return a finalizer, too

Browse Source 
Signed-off-by: beorn7 <beorn@grafana.com>
This commit is contained in:
beorn7 2020-04-17 22:40:39 +02:00
parent f9f423ec0a
commit 69ac27e1b4
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
web/api/v1/api.go
View File

@ -519,7 +519,7 @@ var (
maxTimeFormatted = maxTime.Format(time.RFC3339Nano) maxTimeFormatted = maxTime.Format(time.RFC3339Nano)
) )
func (api *API) series(r *http.Request) apiFuncResult { func (api *API) series(r *http.Request) (result apiFuncResult) {
if err := r.ParseForm(); err != nil { if err := r.ParseForm(); err != nil {
return apiFuncResult{nil, &apiError{errorBadData, errors.Wrapf(err, "error parsing form values")}, nil, nil} return apiFuncResult{nil, &apiError{errorBadData, errors.Wrapf(err, "error parsing form values")}, nil, nil}
} }
@ -549,7 +549,17 @@ func (api *API) series(r *http.Request) apiFuncResult {
if err != nil { if err != nil {
return apiFuncResult{nil, &apiError{errorExec, err}, nil, nil} return apiFuncResult{nil, &apiError{errorExec, err}, nil, nil}
} }
defer q.Close() // From now on, we must only return with a finalizer in the result (to
// be called by the caller) or call q.Close ourselves (which is required
// in the case of a panic).
defer func() {
if result.finalizer == nil {
q.Close()
}
}()
closer := func() {
q.Close()
}
var sets []storage.SeriesSet var sets []storage.SeriesSet
var warnings storage.Warnings var warnings storage.Warnings
@ -557,7 +567,7 @@ func (api *API) series(r *http.Request) apiFuncResult {
s, wrn, err := q.Select(false, nil, mset...) s, wrn, err := q.Select(false, nil, mset...)
warnings = append(warnings, wrn...) warnings = append(warnings, wrn...)
if err != nil { if err != nil {
return apiFuncResult{nil, &apiError{errorExec, err}, warnings, nil} return apiFuncResult{nil, &apiError{errorExec, err}, warnings, closer}
} }
sets = append(sets, s) sets = append(sets, s)
} }
@ -568,10 +578,10 @@ func (api *API) series(r *http.Request) apiFuncResult {
metrics = append(metrics, set.At().Labels()) metrics = append(metrics, set.At().Labels())
} }
if set.Err() != nil { if set.Err() != nil {
return apiFuncResult{nil, &apiError{errorExec, set.Err()}, warnings, nil} return apiFuncResult{nil, &apiError{errorExec, set.Err()}, warnings, closer}
} }
return apiFuncResult{metrics, nil, warnings, nil} return apiFuncResult{metrics, nil, warnings, closer}
} }
func (api *API) dropSeries(r *http.Request) apiFuncResult { func (api *API) dropSeries(r *http.Request) apiFuncResult {