mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #5649 from cstyan/remove-queue-retries

Browse source 
Remove max_retries from queue_config
This commit is contained in:
Ganesh Vernekar 2019-06-17 12:47:16 +05:30 committed by GitHub
parent 3e2781287e e9129abeff
commit 5888066ffa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
config/config.go
View file

@ -116,8 +116,7 @@ var (
Capacity: 10, Capacity: 10,
BatchSendDeadline: model.Duration(5 * time.Second), BatchSendDeadline: model.Duration(5 * time.Second),
// Max number of times to retry a batch on recoverable errors. // Backoff times for retrying a batch of samples on recoverable errors.
MaxRetries: 3,
MinBackoff: model.Duration(30 * time.Millisecond), MinBackoff: model.Duration(30 * time.Millisecond),
MaxBackoff: model.Duration(100 * time.Millisecond), MaxBackoff: model.Duration(100 * time.Millisecond),
} }
@ -594,9 +593,6 @@ type QueueConfig struct {
// Maximum time sample will wait in buffer. // Maximum time sample will wait in buffer.
BatchSendDeadline model.Duration `yaml:"batch_send_deadline,omitempty"` BatchSendDeadline model.Duration `yaml:"batch_send_deadline,omitempty"`
// Max number of times to retry a batch on recoverable errors.
MaxRetries int `yaml:"max_retries,omitempty"`
// On recoverable errors, backoff exponentially. // On recoverable errors, backoff exponentially.
MinBackoff model.Duration `yaml:"min_backoff,omitempty"` MinBackoff model.Duration `yaml:"min_backoff,omitempty"`
MaxBackoff model.Duration `yaml:"max_backoff,omitempty"` MaxBackoff model.Duration `yaml:"max_backoff,omitempty"`

2
docs/configuration/configuration.md
View file

@ -1298,8 +1298,6 @@ queue_config:
[ max_samples_per_send: <int> | default = 100] [ max_samples_per_send: <int> | default = 100]
# Maximum time a sample will wait in buffer. # Maximum time a sample will wait in buffer.
[ batch_send_deadline: <duration> | default = 5s ] [ batch_send_deadline: <duration> | default = 5s ]
# Maximum number of times to retry a batch on recoverable errors.
[ max_retries: <int> | default = 3 ]
# Initial retry delay. Gets doubled for every retry. # Initial retry delay. Gets doubled for every retry.
[ min_backoff: <duration> | default = 30ms ] [ min_backoff: <duration> | default = 30ms ]
# Maximum retry delay. # Maximum retry delay.