Skip to content

Commit f608df2

Browse files
alexqylealexqyle
authored
upgrade thanos to latest main (#5617)
* upgrade thanos to latest main Signed-off-by: Alex Le <leqiyue@amazon.com> * fix lint Signed-off-by: Alex Le <leqiyue@amazon.com> --------- Signed-off-by: Alex Le <leqiyue@amazon.com>
1 parent 8505ac4 commit f608df2

File tree

13 files changed

+196
-139
lines changed

13 files changed

+196
-139
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ require (
5353
github.com/stretchr/testify v1.8.4
5454
github.com/thanos-io/objstore v0.0.0-20230921130928-63a603e651ed
5555
github.com/thanos-io/promql-engine v0.0.0-20231013104847-4517c0d5f591
56-
github.com/thanos-io/thanos v0.32.5-0.20231020043209-42792d9d0e8c
56+
github.com/thanos-io/thanos v0.32.5-0.20231023172853-513272e70874
5757
github.com/uber/jaeger-client-go v2.30.0+incompatible
5858
github.com/weaveworks/common v0.0.0-20221201103051-7c2720a9024d
5959
go.etcd.io/etcd/api/v3 v3.5.9

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1277,8 +1277,8 @@ github.com/thanos-io/objstore v0.0.0-20230921130928-63a603e651ed h1:iWQdY3S6DpWj
12771277
github.com/thanos-io/objstore v0.0.0-20230921130928-63a603e651ed/go.mod h1:oJ82xgcBDzGJrEgUsjlTj6n01+ZWUMMUR8BlZzX5xDE=
12781278
github.com/thanos-io/promql-engine v0.0.0-20231013104847-4517c0d5f591 h1:6bZbFM+Mvy2kL8BeL8TJ5+5pV3sUR2PSLaZyw911rtQ=
12791279
github.com/thanos-io/promql-engine v0.0.0-20231013104847-4517c0d5f591/go.mod h1:vfXJv1JXNdLfHnjsHsLLJl5tyI7KblF76Wo5lZ9YC4Q=
1280-
github.com/thanos-io/thanos v0.32.5-0.20231020043209-42792d9d0e8c h1:M0XaUc+MummgpYJJkYhe2+bEO8H0KNmm/mIIpMTgyYc=
1281-
github.com/thanos-io/thanos v0.32.5-0.20231020043209-42792d9d0e8c/go.mod h1:qHdYVTXuIZMXn2VX5KprDH5utFxR+29uqq4GIQ1OM6g=
1280+
github.com/thanos-io/thanos v0.32.5-0.20231023172853-513272e70874 h1:7/j60inmFvV9uFvbxDdghob5DR92M7mvmn/Tw+CKK3o=
1281+
github.com/thanos-io/thanos v0.32.5-0.20231023172853-513272e70874/go.mod h1:eVFfte7jP1aTcTkQcZEj5/P9rCeMFHllEqfNZqirLLA=
12821282
github.com/themihai/gomemcache v0.0.0-20180902122335-24332e2d58ab h1:7ZR3hmisBWw77ZpO1/o86g+JV3VKlk3d48jopJxzTjU=
12831283
github.com/themihai/gomemcache v0.0.0-20180902122335-24332e2d58ab/go.mod h1:eheTFp954zcWZXCU8d0AT76ftsQOTo4DTqkN/h3k1MY=
12841284
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=

‎pkg/querier/blocks_consistency_checker_test.go‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36,52 +36,52 @@ func TestBlocksConsistencyChecker_Check(t *testing.T) {
3636
},
3737
"all known blocks have been queried from a single store-gateway": {
3838
knownBlocks: bucketindex.Blocks{
39-
{ID: block1, UploadedAt: now.Add(-time.Hour).Unix()},
40-
{ID: block2, UploadedAt: now.Add(-time.Hour).Unix()},
39+
&bucketindex.Block{ID: block1, UploadedAt: now.Add(-time.Hour).Unix()},
40+
&bucketindex.Block{ID: block2, UploadedAt: now.Add(-time.Hour).Unix()},
4141
},
4242
knownDeletionMarks: map[ulid.ULID]*bucketindex.BlockDeletionMark{},
4343
queriedBlocks: []ulid.ULID{block1, block2},
4444
},
4545
"all known blocks have been queried from multiple store-gateway": {
4646
knownBlocks: bucketindex.Blocks{
47-
{ID: block1, UploadedAt: now.Add(-time.Hour).Unix()},
48-
{ID: block2, UploadedAt: now.Add(-time.Hour).Unix()},
47+
&bucketindex.Block{ID: block1, UploadedAt: now.Add(-time.Hour).Unix()},
48+
&bucketindex.Block{ID: block2, UploadedAt: now.Add(-time.Hour).Unix()},
4949
},
5050
knownDeletionMarks: map[ulid.ULID]*bucketindex.BlockDeletionMark{},
5151
queriedBlocks: []ulid.ULID{block1, block2},
5252
},
5353
"store-gateway has queried more blocks than expected": {
5454
knownBlocks: bucketindex.Blocks{
55-
{ID: block1, UploadedAt: now.Add(-time.Hour).Unix()},
56-
{ID: block2, UploadedAt: now.Add(-time.Hour).Unix()},
55+
&bucketindex.Block{ID: block1, UploadedAt: now.Add(-time.Hour).Unix()},
56+
&bucketindex.Block{ID: block2, UploadedAt: now.Add(-time.Hour).Unix()},
5757
},
5858
knownDeletionMarks: map[ulid.ULID]*bucketindex.BlockDeletionMark{},
5959
queriedBlocks: []ulid.ULID{block1, block2, block3},
6060
},
6161
"store-gateway has queried less blocks than expected": {
6262
knownBlocks: bucketindex.Blocks{
63-
{ID: block1, UploadedAt: now.Add(-time.Hour).Unix()},
64-
{ID: block2, UploadedAt: now.Add(-time.Hour).Unix()},
65-
{ID: block3, UploadedAt: now.Add(-time.Hour).Unix()},
63+
&bucketindex.Block{ID: block1, UploadedAt: now.Add(-time.Hour).Unix()},
64+
&bucketindex.Block{ID: block2, UploadedAt: now.Add(-time.Hour).Unix()},
65+
&bucketindex.Block{ID: block3, UploadedAt: now.Add(-time.Hour).Unix()},
6666
},
6767
knownDeletionMarks: map[ulid.ULID]*bucketindex.BlockDeletionMark{},
6868
queriedBlocks: []ulid.ULID{block1, block3},
6969
expectedMissingBlocks: []ulid.ULID{block2},
7070
},
7171
"store-gateway has queried less blocks than expected, but the missing block has been recently uploaded": {
7272
knownBlocks: bucketindex.Blocks{
73-
{ID: block1, UploadedAt: now.Add(-time.Hour).Unix()},
74-
{ID: block2, UploadedAt: now.Add(-time.Hour).Unix()},
75-
{ID: block3, UploadedAt: now.Add(-uploadGracePeriod).Add(time.Minute).Unix()},
73+
&bucketindex.Block{ID: block1, UploadedAt: now.Add(-time.Hour).Unix()},
74+
&bucketindex.Block{ID: block2, UploadedAt: now.Add(-time.Hour).Unix()},
75+
&bucketindex.Block{ID: block3, UploadedAt: now.Add(-uploadGracePeriod).Add(time.Minute).Unix()},
7676
},
7777
knownDeletionMarks: map[ulid.ULID]*bucketindex.BlockDeletionMark{},
7878
queriedBlocks: []ulid.ULID{block1, block2},
7979
},
8080
"store-gateway has queried less blocks than expected and the missing block has been recently marked for deletion": {
8181
knownBlocks: bucketindex.Blocks{
82-
{ID: block1, UploadedAt: now.Add(-time.Hour).Unix()},
83-
{ID: block2, UploadedAt: now.Add(-time.Hour).Unix()},
84-
{ID: block3, UploadedAt: now.Add(-time.Hour).Unix()},
82+
&bucketindex.Block{ID: block1, UploadedAt: now.Add(-time.Hour).Unix()},
83+
&bucketindex.Block{ID: block2, UploadedAt: now.Add(-time.Hour).Unix()},
84+
&bucketindex.Block{ID: block3, UploadedAt: now.Add(-time.Hour).Unix()},
8585
},
8686
knownDeletionMarks: map[ulid.ULID]*bucketindex.BlockDeletionMark{
8787
block3: {DeletionTime: now.Add(-deletionGracePeriod / 2).Unix()},
@@ -91,9 +91,9 @@ func TestBlocksConsistencyChecker_Check(t *testing.T) {
9191
},
9292
"store-gateway has queried less blocks than expected and the missing block has been marked for deletion long time ago": {
9393
knownBlocks: bucketindex.Blocks{
94-
{ID: block1, UploadedAt: now.Add(-time.Hour).Unix()},
95-
{ID: block2, UploadedAt: now.Add(-time.Hour).Unix()},
96-
{ID: block3, UploadedAt: now.Add(-time.Hour).Unix()},
94+
&bucketindex.Block{ID: block1, UploadedAt: now.Add(-time.Hour).Unix()},
95+
&bucketindex.Block{ID: block2, UploadedAt: now.Add(-time.Hour).Unix()},
96+
&bucketindex.Block{ID: block3, UploadedAt: now.Add(-time.Hour).Unix()},
9797
},
9898
knownDeletionMarks: map[ulid.ULID]*bucketindex.BlockDeletionMark{
9999
block3: {DeletionTime: now.Add(-deletionGracePeriod * 2).Unix()},

0 commit comments

Comments
 (0)