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

Jump to bottom

TestIngester_PushToStorage_CircuitBreaker: increase initial delay #9351

Merged
merged 2 commits into from
Sep 20, 2024
Merged

TestIngester_PushToStorage_CircuitBreaker: increase initial delay #9351

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e8ff84
TestIngester_PushToStorage_CircuitBreaker: increase initial delay
dimitarvdimitrov Sep 20, 2024
a299bcd
Adjust all tests
dimitarvdimitrov Sep 20, 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
42 changes: 21 additions & 21 deletions pkg/ingester/circuitbreaker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ func TestCircuitBreaker_FinishRequest(t *testing.T) {
}
}

func TestIngester_PushToStorage_CircuitBreaker(t *testing.T) {
func TestIngester_IngestStorage_PushToStorage_CircuitBreaker(t *testing.T) {
pushTimeout := 100 * time.Millisecond
tests := map[string]struct {
expectedErrorWhenCircuitBreakerClosed error
Expand Down Expand Up @@ -455,7 +455,7 @@ func TestIngester_PushToStorage_CircuitBreaker(t *testing.T) {
failureThreshold := 2
var initialDelay time.Duration
if initialDelayEnabled {
initialDelay = 200 * time.Millisecond
initialDelay = time.Hour
}
Comment on lines 457 to 459
Copy link
Contributor

Choose a reason for hiding this comment

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

There is also TestIngester_Push_CircuitBreaker_DeadlineExceeded down there, which uses the same test pattern, where initialDelay = 200 * time.Millisecond. Should we, maybe, update it also, to keep the tests consistent. Otherwise, it makes it even more complicated to follow what those tests are actually testing.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yeah probably. I think one uses ingest storage, the other one doesn't

Copy link
Contributor Author

Choose a reason for hiding this comment

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

pushed this a299bcd

cfg.PushCircuitBreaker = CircuitBreakerConfig{
Enabled: true,
Expand Down Expand Up @@ -794,7 +794,7 @@ func TestIngester_Push_CircuitBreaker_DeadlineExceeded(t *testing.T) {
failureThreshold := 2
var initialDelay time.Duration
if initialDelayEnabled {
initialDelay = 200 * time.Millisecond
initialDelay = time.Hour
}
cfg.PushCircuitBreaker = CircuitBreakerConfig{
Enabled: true,
Expand Down Expand Up @@ -906,24 +906,24 @@ func TestIngester_Push_CircuitBreaker_DeadlineExceeded(t *testing.T) {
`
} else {
expectedMetrics = `
# HELP cortex_ingester_circuit_breaker_results_total Results of executing requests via the circuit breaker.
# TYPE cortex_ingester_circuit_breaker_results_total counter
cortex_ingester_circuit_breaker_results_total{request_type="push",result="circuit_breaker_open"} 2
cortex_ingester_circuit_breaker_results_total{request_type="push",result="error"} 2
cortex_ingester_circuit_breaker_results_total{request_type="push",result="success"} 1
# HELP cortex_ingester_circuit_breaker_transitions_total Number of times the circuit breaker has entered a state.
# TYPE cortex_ingester_circuit_breaker_transitions_total counter
cortex_ingester_circuit_breaker_transitions_total{request_type="push",state="closed"} 0
cortex_ingester_circuit_breaker_transitions_total{request_type="push",state="half-open"} 0
cortex_ingester_circuit_breaker_transitions_total{request_type="push",state="open"} 1
# HELP cortex_ingester_circuit_breaker_current_state Boolean set to 1 whenever the circuit breaker is in a state corresponding to the label name.
# TYPE cortex_ingester_circuit_breaker_current_state gauge
cortex_ingester_circuit_breaker_current_state{request_type="push",state="closed"} 0
cortex_ingester_circuit_breaker_current_state{request_type="push",state="half-open"} 0
cortex_ingester_circuit_breaker_current_state{request_type="push",state="open"} 1
# HELP cortex_ingester_circuit_breaker_request_timeouts_total Number of times the circuit breaker recorded a request that reached timeout.
# TYPE cortex_ingester_circuit_breaker_request_timeouts_total counter
cortex_ingester_circuit_breaker_request_timeouts_total{request_type="push"} 2
# HELP cortex_ingester_circuit_breaker_results_total Results of executing requests via the circuit breaker.
# TYPE cortex_ingester_circuit_breaker_results_total counter
cortex_ingester_circuit_breaker_results_total{request_type="push",result="circuit_breaker_open"} 2
cortex_ingester_circuit_breaker_results_total{request_type="push",result="error"} 2
cortex_ingester_circuit_breaker_results_total{request_type="push",result="success"} 1
# HELP cortex_ingester_circuit_breaker_transitions_total Number of times the circuit breaker has entered a state.
# TYPE cortex_ingester_circuit_breaker_transitions_total counter
cortex_ingester_circuit_breaker_transitions_total{request_type="push",state="closed"} 0
cortex_ingester_circuit_breaker_transitions_total{request_type="push",state="half-open"} 0
cortex_ingester_circuit_breaker_transitions_total{request_type="push",state="open"} 1
# HELP cortex_ingester_circuit_breaker_current_state Boolean set to 1 whenever the circuit breaker is in a state corresponding to the label name.
# TYPE cortex_ingester_circuit_breaker_current_state gauge
cortex_ingester_circuit_breaker_current_state{request_type="push",state="closed"} 0
cortex_ingester_circuit_breaker_current_state{request_type="push",state="half-open"} 0
cortex_ingester_circuit_breaker_current_state{request_type="push",state="open"} 1
# HELP cortex_ingester_circuit_breaker_request_timeouts_total Number of times the circuit breaker recorded a request that reached timeout.
# TYPE cortex_ingester_circuit_breaker_request_timeouts_total counter
cortex_ingester_circuit_breaker_request_timeouts_total{request_type="push"} 2
`
}
assert.NoError(t, testutil.GatherAndCompare(registry, strings.NewReader(expectedMetrics), metricNames...))
Expand Down
Loading