Skip to content

fix(s3): Fix compactor to properly consider SSE-KMS information during metadata copy#5774

Merged
javiermolinar merged 1 commit intografana:mainfrom
steffsas:fix/sse-compactor
Oct 21, 2025
Merged

fix(s3): Fix compactor to properly consider SSE-KMS information during metadata copy#5774
javiermolinar merged 1 commit intografana:mainfrom
steffsas:fix/sse-compactor

Conversation

@steffsas
Copy link
Copy Markdown
Contributor

@steffsas steffsas commented Oct 20, 2025

What this PR does:
The compactor.go implementation did not properly handle SSE-KMS information when provided. This has now been fixed. It is important to note that core.CopyObject does not respect SSE configuration even if specified via minio.CopySrcOptions{}, so the code was updated to use core.Client.CopyObject instead.

Additional tests were added to ensure that MarkBlockCompacted correctly adheres to the SSE configuration. I refactored fakeServerWithHeader to assign all HTTP header to the given pointer instead of a single one for better testing.

The changes have been verified with MinIO, MinIO KES, and Tempo. If desired, I can add the accompanying docker compose file to example/docker-compose/ for easier testing and demonstration of SSE-KMS.

Which issue(s) this PR fixes:
Fixes #5711

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

@CLAassistant
Copy link
Copy Markdown

CLAassistant commented Oct 20, 2025

CLA assistant check
All committers have signed the CLA.

Copy link
Copy Markdown
Contributor

@javiermolinar javiermolinar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. It seems the formatting is not correct. Could you fix it?

@steffsas
Copy link
Copy Markdown
Contributor Author

Looks good to me. It seems the formatting is not correct. Could you fix it?

done

Copy link
Copy Markdown
Contributor

@javiermolinar javiermolinar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for your contribution!

@javiermolinar javiermolinar merged commit dcbd3bd into grafana:main Oct 21, 2025
37 of 38 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

S3 KMS SSE Errors in Compactor

3 participants