Skip to content

Commit 1fccebd

Browse files
authored
Fix s3 upload performance regression (#7241)
* Fix S3 upload performance regression Signed-off-by: Marco Pracucci <[email protected]> * Add CHANGELOG entry Signed-off-by: Marco Pracucci <[email protected]> --------- Signed-off-by: Marco Pracucci <[email protected]>
1 parent f941f47 commit 1fccebd

File tree

5 files changed

+79
-65
lines changed

5 files changed

+79
-65
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
* `label_names_and_values`: label names / values query
7676
* `active_series`: active series query
7777
* `other`: any other request
78+
* [BUGFIX] Fix performance regression introduced in Mimir 2.11.0 when uploading blocks to AWS S3. #7240
7879

7980
### Mixin
8081

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ require (
6969
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db
7070
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
7171
github.com/prometheus/procfs v0.12.0
72-
github.com/thanos-io/objstore v0.0.0-20240116185442-6ecabdddaab1
72+
github.com/thanos-io/objstore v0.0.0-20240128223450-bdadaefbfe03
7373
github.com/twmb/franz-go v1.15.4
7474
github.com/twmb/franz-go/pkg/kadm v1.10.0
7575
github.com/twmb/franz-go/pkg/kfake v0.0.0-20231206062516-c09dc92d2db1

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -942,8 +942,8 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl
942942
github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
943943
github.com/tencentyun/cos-go-sdk-v5 v0.7.40 h1:W6vDGKCHe4wBACI1d2UgE6+50sJFhRWU4O8IB2ozzxM=
944944
github.com/tencentyun/cos-go-sdk-v5 v0.7.40/go.mod h1:4dCEtLHGh8QPxHEkgq+nFaky7yZxQuYwgSJM87icDaw=
945-
github.com/thanos-io/objstore v0.0.0-20240116185442-6ecabdddaab1 h1:8taDMdkqtKO6uB+JKwXnz2jByLwBLY+GnXp3ShXjUKY=
946-
github.com/thanos-io/objstore v0.0.0-20240116185442-6ecabdddaab1/go.mod h1:RMvJQnpB4QQiYGg1gF8mnPJg6IkIPY28Buh8f6b+F0c=
945+
github.com/thanos-io/objstore v0.0.0-20240128223450-bdadaefbfe03 h1:VEu81Atmor2RVr5iGzlLc7E8X9jd1ux0ze4Ie5Qw8n0=
946+
github.com/thanos-io/objstore v0.0.0-20240128223450-bdadaefbfe03/go.mod h1:RMvJQnpB4QQiYGg1gF8mnPJg6IkIPY28Buh8f6b+F0c=
947947
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
948948
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
949949
github.com/twmb/franz-go v1.15.4 h1:qBCkHaiutetnrXjAUWA99D9FEcZVMt2AYwkH3vWEQTw=

vendor/github.com/thanos-io/objstore/objstore.go

+74-61
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)