Skip to content
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.

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

Fix compactor ignore configurable S3 headers #3154

Merged
merged 2 commits into from Nov 20, 2023

Conversation

Batkilin
Copy link
Contributor

@Batkilin Batkilin commented Nov 18, 2023

What this PR does: Fix bug in compactor use of s3 headers

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

Checklist

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

Hi :)
I am not a Go dev, but I need this fixed in order to use Tempo on my environment, It would be great if someone can help me complete the Checklist and merge this

@CLAassistant
Copy link

CLAassistant commented Nov 18, 2023

CLA assistant check
All committers have signed the CLA.

Copy link
Member

@joe-elliott joe-elliott left a comment

Choose a reason for hiding this comment

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

Nice fix! We appreciate the contribution.

@joe-elliott joe-elliott merged commit 57c3300 into grafana:main Nov 20, 2023
14 checks passed
@joe-elliott joe-elliott added type/bug Something isn't working backport release-v2.3 labels Nov 22, 2023
Copy link
Contributor

The backport to release-v2.3 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-3154-to-release-v2.3 origin/release-v2.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 57c3300b565b6d92fe423b91241081a6fe4d84a0

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-3154-to-release-v2.3
# Create the PR body template
PR_BODY=$(gh pr view 3154 --json body --template 'Backport 57c3300b565b6d92fe423b91241081a6fe4d84a0 from #3154{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title "[release-v2.3] Fix compactor ignore configurable S3 headers" --body-file - --label "type/bug" --label "backport" --base release-v2.3 --milestone release-v2.3 --web

Or, if you don't have the GitHub CLI installed (we recommend you install it!):

# Push the branch to GitHub:
git push --set-upstream origin backport-3154-to-release-v2.3

# Create a pull request where the `base` branch is `release-v2.3` and the `compare`/`head` branch is `backport-3154-to-release-v2.3`.

# Remove the local backport branch
git switch main
git branch -D backport-3154-to-release-v2.3

joe-elliott pushed a commit that referenced this pull request Nov 27, 2023
* Fix compactor use of configurable S3 headers

* Update changelog

(cherry picked from commit 57c3300)
joe-elliott added a commit that referenced this pull request Nov 27, 2023
* Fix compactor use of configurable S3 headers

* Update changelog

(cherry picked from commit 57c3300)

Co-authored-by: Tal Batkilin <41674917+Batkilin@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Compactor does not use configured S3 Object Options
3 participants