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.

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

fix(s3): disable client retries when congestion control is enabled #14588

Merged
merged 2 commits into from
Oct 24, 2024
+5 −8
Merged

fix(s3): disable client retries when congestion control is enabled #14588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf5451d
s3: disable client retries when congestion control is enabled
ashwanthgoli Oct 23, 2024
fe4dac7
make docs
ashwanthgoli Oct 23, 2024
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
7 changes: 0 additions & 7 deletions docs/sources/shared/configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5646,13 +5646,6 @@ congestion_control:
# CLI flag: -store.max-parallel-get-chunk
[max_parallel_get_chunk: <int> | default = 150]

# Enables the use of thanos-io/objstore clients for connecting to object
# storage. When set to true, the configuration inside
# `storage_config.object_store` or `common.storage.object_store` block takes
# effect.
# CLI flag: -use-thanos-objstore
[use_thanos_objstore: <boolean> | default = false]

# The maximum number of chunks to fetch per batch.
# CLI flag: -store.max-chunk-batch-size
[max_chunk_batch_size: <int> | default = 50]
Expand Down
6 changes: 5 additions & 1 deletion pkg/storage/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ type Config struct {
DisableBroadIndexQueries bool `yaml:"disable_broad_index_queries"`
MaxParallelGetChunk int `yaml:"max_parallel_get_chunk"`

UseThanosObjstore bool `yaml:"use_thanos_objstore" doc:"hidden`
UseThanosObjstore bool `yaml:"use_thanos_objstore" doc:"hidden"`
Copy link
Collaborator

Choose a reason for hiding this comment

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

I'm confused how this is related?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it's not, my editor corrected the incorrect tag

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i think i'll keep this change here instead of raising another pr for this small correction :)

ObjectStore bucket.Config `yaml:"object_store" doc:"hidden"`

MaxChunkBatchSize int `yaml:"max_chunk_batch_size"`
Expand Down Expand Up @@ -650,6 +650,10 @@ func internalNewObjectClient(storeName, component string, cfg Config, clientMetr
}
s3Cfg = awsCfg.S3Config
}

if cfg.CongestionControl.Enabled {
s3Cfg.BackoffConfig.MaxRetries = 1
}
return aws.NewS3ObjectClient(s3Cfg, cfg.Hedging)

case types.StorageTypeAlibabaCloud:
Expand Down
Loading