From 161b8ed3fc4c8448a36e15a2f949a4dcb9880e18 Mon Sep 17 00:00:00 2001 From: Marco Pracucci Date: Fri, 3 Apr 2020 18:10:17 +0200 Subject: [PATCH 1/2] Fixed response status code while iterating chunks in the blocks storage Signed-off-by: Marco Pracucci --- CHANGELOG.md | 1 + pkg/querier/block.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c52d5bc495f..20960e8bfc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ * [ENHANCEMENT] FIFO cache to support eviction based on memory usage. The `-.fifocache.size` CLI flag has been renamed to `-.fifocache.max-size-items` as well as its YAML config option `size` renamed to `max_size_items`. Added `-.fifocache.max-size-bytes` CLI flag and YAML config option `max_size_bytes` to specify memory limit of the cache. #2319 * [BUGFIX] Experimental TSDB: fixed chunk data corruption when querying back series using the experimental blocks storage. #2400 * [BUGFIX] Cassandra Storage: Fix endpoint TLS host verification. #2109 +* [BUGFIX] Experimental TSDB: fixed response status code from `422` to `500` when an error occurs while iterating chunks with the experimental blocks storage. ## 1.0.0 / 2020-04-02 diff --git a/pkg/querier/block.go b/pkg/querier/block.go index a10960c3cf9..51ad1d2e22b 100644 --- a/pkg/querier/block.go +++ b/pkg/querier/block.go @@ -335,7 +335,7 @@ func (it *blockQuerierSeriesIterator) Err() error { err := it.iterators[it.i].Err() if err != nil { - return errors.Wrapf(err, "cannot iterate chunk for series: %v", it.labels) + return promql.ErrStorage{Err: errors.Wrapf(err, "cannot iterate chunk for series: %v", it.labels)} } return nil } From bb4db1952c36813bd35e529c6ec299dad1665188 Mon Sep 17 00:00:00 2001 From: Marco Pracucci Date: Fri, 3 Apr 2020 18:12:17 +0200 Subject: [PATCH 2/2] Added PR number to CHANGELOG Signed-off-by: Marco Pracucci --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 20960e8bfc2..c92a32e11c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ * [ENHANCEMENT] FIFO cache to support eviction based on memory usage. The `-.fifocache.size` CLI flag has been renamed to `-.fifocache.max-size-items` as well as its YAML config option `size` renamed to `max_size_items`. Added `-.fifocache.max-size-bytes` CLI flag and YAML config option `max_size_bytes` to specify memory limit of the cache. #2319 * [BUGFIX] Experimental TSDB: fixed chunk data corruption when querying back series using the experimental blocks storage. #2400 * [BUGFIX] Cassandra Storage: Fix endpoint TLS host verification. #2109 -* [BUGFIX] Experimental TSDB: fixed response status code from `422` to `500` when an error occurs while iterating chunks with the experimental blocks storage. +* [BUGFIX] Experimental TSDB: fixed response status code from `422` to `500` when an error occurs while iterating chunks with the experimental blocks storage. #2402 ## 1.0.0 / 2020-04-02