mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-02-21 03:16:00 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

add context cancellation check at get series result iteration (#13766)

Browse source 
* add context cancellation check at get series iteration
* add warnings and closer on error
* add test

---------

Signed-off-by: Erlan Zholdubai uulu <erlanz@amazon.com>
This commit is contained in:
Erlan Zholdubai uulu 2024-03-19 10:37:43 -07:00 committed by GitHub
parent 16164226e5
commit 742196b6c4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
web/api/v1/api.go
View file

@ -882,6 +882,9 @@ func (api *API) series(r *http.Request) (result apiFuncResult) {
warnings := set.Warnings() warnings := set.Warnings()
for set.Next() { for set.Next() {
if err := ctx.Err(); err != nil {
return apiFuncResult{nil, returnAPIError(err), warnings, closer}
}
metrics = append(metrics, set.At().Labels()) metrics = append(metrics, set.At().Labels())
if len(metrics) >= limit { if len(metrics) >= limit {

3
web/api/v1/api_test.go
View file

@ -3568,6 +3568,9 @@ func TestReturnAPIError(t *testing.T) {
}, { }, {
err: errors.New("exec error"), err: errors.New("exec error"),
expected: errorExec, expected: errorExec,
}, {
err: context.Canceled,
expected: errorCanceled,
}, },
} }