Skip to content

Commit 676bcf9

Browse files
committed
Update Thanos to fix issues with vertical sharding
Signed-off-by: Justin Jung <jungjust@amazon.com>
1 parent 04fc317 commit 676bcf9

File tree

13 files changed

+122
-79
lines changed

13 files changed

+122
-79
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
* [BUGFIX] Querier: Fix `/api/v1/series` returning 5XX instead of 4XX when limits are hit. #5169
5151
* [BUGFIX] Compactor: Fix issue that shuffle sharding planner return error if block is under visit by other compactor. #5188
5252
* [FEATURE] Alertmanager: Add support for time_intervals. #5102
53+
* [BUGFIX] Query Frontend: Disable `absent`, `absent_over_time` and `scalar` for vertical sharding. #5221
5354

5455
## 1.14.0 2022-12-02
5556

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ require (
5454
github.com/stretchr/testify v1.8.2
5555
github.com/thanos-community/promql-engine v0.0.0-20230224075812-ae04bbea7613
5656
github.com/thanos-io/objstore v0.0.0-20230201072718-11ffbc490204
57-
github.com/thanos-io/thanos v0.31.0-rc.1
57+
github.com/thanos-io/thanos v0.29.1-0.20230314065129-06d9da40244f
5858
github.com/uber/jaeger-client-go v2.30.0+incompatible
5959
github.com/weaveworks/common v0.0.0-20221201103051-7c2720a9024d
6060
go.etcd.io/etcd/api/v3 v3.5.7

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1513,8 +1513,8 @@ github.com/thanos-community/promql-engine v0.0.0-20230224075812-ae04bbea7613 h1:
15131513
github.com/thanos-community/promql-engine v0.0.0-20230224075812-ae04bbea7613/go.mod h1:gREn4JarQ2DZdWirOtqZQd3p+c1xH+UVpGRjGKVoWx8=
15141514
github.com/thanos-io/objstore v0.0.0-20230201072718-11ffbc490204 h1:W4w5Iph7j32Sf1QFWLJDCqvO0WgZS0jHGID+qnq3wV0=
15151515
github.com/thanos-io/objstore v0.0.0-20230201072718-11ffbc490204/go.mod h1:STSgpY8M6EKF2G/raUFdbIMf2U9GgYlEjAEHJxjvpAo=
1516-
github.com/thanos-io/thanos v0.31.0-rc.1 h1:0BXE8CTwx6/MSfOMEc0Lz8r35OkxQGZEgHDyxrdy+60=
1517-
github.com/thanos-io/thanos v0.31.0-rc.1/go.mod h1:5ux+jb2oKr59+3XsCC0mX+JuAbPGJEMijjhcmnL/PMo=
1516+
github.com/thanos-io/thanos v0.29.1-0.20230314065129-06d9da40244f h1:zp6JvrGDrUb6FNUXF++7EGg9JpETUY6GdLNuKRZbIK4=
1517+
github.com/thanos-io/thanos v0.29.1-0.20230314065129-06d9da40244f/go.mod h1:AARtONvIIYyIm7w452siKssMT71kTAe4E3cORnLBj2g=
15181518
github.com/themihai/gomemcache v0.0.0-20180902122335-24332e2d58ab h1:7ZR3hmisBWw77ZpO1/o86g+JV3VKlk3d48jopJxzTjU=
15191519
github.com/themihai/gomemcache v0.0.0-20180902122335-24332e2d58ab/go.mod h1:eheTFp954zcWZXCU8d0AT76ftsQOTo4DTqkN/h3k1MY=
15201520
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=

pkg/storegateway/gateway_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"fmt"
66
"math"
77
"math/rand"
8-
"net/http"
98
"os"
109
"path"
1110
"path/filepath"
@@ -15,6 +14,8 @@ import (
1514
"testing"
1615
"time"
1716

17+
"google.golang.org/grpc/codes"
18+
1819
"github.com/go-kit/log"
1920
"github.com/oklog/ulid"
2021
"github.com/pkg/errors"
@@ -897,7 +898,7 @@ func TestStoreGateway_SeriesQueryingShouldEnforceMaxChunksPerQueryLimit(t *testi
897898
},
898899
"should return error if the actual number of queried chunks is > limit": {
899900
limit: chunksQueried - 1,
900-
expectedErr: status.Error(http.StatusUnprocessableEntity, fmt.Sprintf("exceeded chunks limit: rpc error: code = Code(422) desc = limit %d violated (got %d)", chunksQueried-1, chunksQueried)),
901+
expectedErr: status.Error(codes.ResourceExhausted, fmt.Sprintf("exceeded chunks limit: rpc error: code = Code(422) desc = limit %d violated (got %d)", chunksQueried-1, chunksQueried)),
901902
},
902903
}
903904

@@ -983,7 +984,7 @@ func TestStoreGateway_SeriesQueryingShouldEnforceMaxSeriesPerQueryLimit(t *testi
983984
},
984985
"should return error if the actual number of queried series is > limit": {
985986
limit: seriesQueried - 1,
986-
expectedErr: status.Error(http.StatusUnprocessableEntity, fmt.Sprintf("exceeded series limit: rpc error: code = Code(422) desc = limit %d violated (got %d)", seriesQueried-1, seriesQueried)),
987+
expectedErr: status.Error(codes.ResourceExhausted, fmt.Sprintf("exceeded series limit: rpc error: code = Code(422) desc = limit %d violated (got %d)", seriesQueried-1, seriesQueried)),
987988
},
988989
}
989990

vendor/github.com/thanos-io/thanos/pkg/extkingpin/flags.go

Lines changed: 0 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/thanos/pkg/extprom/http/instrument_server.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/thanos/pkg/querysharding/analyzer.go

Lines changed: 17 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/thanos/pkg/store/bucket.go

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/thanos/pkg/store/storepb/custom.go

Lines changed: 0 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/thanos/pkg/store/storepb/prompb/samples.go

Lines changed: 86 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/thanos/pkg/store/tsdb.go

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/thanos-io/thanos/pkg/testutil/e2eutil/prometheus.go

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)