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

feat(thanos): disable retries when congestion control is enabled #14867

Merged
merged 3 commits into from
Nov 12, 2024

Conversation

ashwanthgoli
Copy link
Contributor

@ashwanthgoli ashwanthgoli commented Nov 12, 2024

What this PR does / why we need it:
Configures max retries to 1 to disable retries when congestion control is enabled. Plus some refactoring to reduce duplicate code coming from provider specific adapters

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

@ashwanthgoli ashwanthgoli marked this pull request as ready for review November 12, 2024 07:17
@ashwanthgoli ashwanthgoli requested a review from a team as a code owner November 12, 2024 07:17
@@ -37,19 +66,14 @@ func NewObjectClientAdapter(bucket, hedgedBucket objstore.Bucket, logger log.Log
},
}

for _, opt := range opts {
Copy link
Contributor

Choose a reason for hiding this comment

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

IIUC we are removing this because we removed the ClientOptions right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes. It was being used to apply retry strategy from the provider specific adapters, but that bit is moved to the init func

@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Nov 12, 2024

Hello @ashwanthgoli!
Backport pull requests need to be either:

  • Pull requests which address bugs,
  • Urgent fixes which need product approval, in order to get merged,
  • Docs changes.

Please, if the current pull request addresses a bug fix, label it with the type/bug label.
If it already has the product approval, please add the product-approved label. For docs changes, please add the type/docs label.
If the pull request modifies CI behaviour, please add the type/ci label.
If none of the above applies, please consider removing the backport label and target the next major/minor release.
Thanks!

@ashwanthgoli ashwanthgoli merged commit 947a66f into main Nov 12, 2024
67 of 68 checks passed
@ashwanthgoli ashwanthgoli deleted the thanos-congestion-control branch November 12, 2024 09:25
@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Nov 12, 2024

This PR must be merged before a backport PR will be created.

@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Nov 12, 2024

The backport to k228 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-14867-to-k228 origin/k228
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 947a66f35e1e02505290f52f2eee17c3e281cbbc

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-14867-to-k228
# Create the PR body template
PR_BODY=$(gh pr view 14867 --json body --template 'Backport 947a66f35e1e02505290f52f2eee17c3e281cbbc from #14867{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'feat(thanos): disable retries when congestion control is enabled (backport k228)' --body-file - --label 'size/L' --label 'product-approved' --label 'backport' --base k228 --milestone k228 --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-14867-to-k228

# Create a pull request where the `base` branch is `k228` and the `compare`/`head` branch is `backport-14867-to-k228`.

# Remove the local backport branch
git switch main
git branch -D backport-14867-to-k228

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.

2 participants