Skip to content

[release-v2.3] Fix compactor ignore configurable S3 headers #3181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joe-elliott merged 1 commit into from
Nov 27, 2023
Merged

[release-v2.3] Fix compactor ignore configurable S3 headers #3181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## main / unreleased

* [BUGFIX] Include statusMessage intrinsic attribute in tag search. [#3084](https://github.com/grafana/tempo/pull/3084) (@rcrowe)
* [BUGFIX] Fix compactor ignore configured S3 headers [#3149](https://github.com/grafana/tempo/pull/3154) (@Batkilin)

## v2.3.0-rc.0 / 2023-10-20

Expand Down
4 changes: 3 additions & 1 deletion tempodb/backend/s3/compactor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ func (rw *readerWriter) MarkBlockCompacted(blockID uuid.UUID, tenantID string) e
return backend.ErrEmptyBlockID
}

putObjectOptions := getPutObjectOptions(rw)

metaFileName := backend.MetaFileName(blockID, tenantID, rw.cfg.Prefix)
// copy meta.json to meta.compacted.json
_, err := rw.core.CopyObject(
Expand All @@ -30,7 +32,7 @@ func (rw *readerWriter) MarkBlockCompacted(blockID uuid.UUID, tenantID string) e
backend.CompactedMetaFileName(blockID, tenantID, rw.cfg.Prefix),
nil,
minio.CopySrcOptions{},
minio.PutObjectOptions{},
putObjectOptions,
)
if err != nil {
return fmt.Errorf("error copying obj meta to compacted obj meta: %w", err)
Expand Down