Fix compactor ignore configurable S3 headers#3154
Merged
joe-elliott merged 2 commits intografana:mainfrom Nov 20, 2023
Merged
Conversation
Batkilin
requested review from
annanay25,
electron0zero,
ie-pham,
joe-elliott,
mapno,
mdisibio,
stoewer,
yvrhdn and
zalegrala
as code owners
|
|
joe-elliott
approved these changes
Nov 20, 2023
Collaborator
joe-elliott
left a comment
joe-elliott
left a comment
There was a problem hiding this comment.
Nice fix! We appreciate the contribution.
Contributor
|
The backport to 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 57c3300b565b6d92fe423b91241081a6fe4d84a0When the conflicts are resolved, stage and commit the changes: 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 --webOr, 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)
3 tasks
joe-elliott
added a commit
that referenced
this pull request
Nov 27, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this PR does: Fix bug in compactor use of s3 headers
Which issue(s) this PR fixes:
Fixes #3149
Checklist
CHANGELOG.mdupdated - 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