Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor: rename last_probe instant 

last_probe was "the instant at which the last set of probes started
being sent" in my head, but Carol saw it as "first_probe - the time at
which probes started being sent".

Hopefully probe_window_started_at is less ambiguous.
pull/24376/head
Dom Dwyer 2023-01-24 12:03:28 +01:00
parent 2f3fb48091
commit c4b04a16c5
No known key found for this signature in database
GPG Key ID: E4C40DBD9157879A
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
router/src/dml_handlers/rpc_write/circuit_breaker.rs
View File

@ -164,7 +164,12 @@ pub(crate) struct CircuitBreaker {
#[derive(Debug, Default)]
struct ProbeState {
last_probe: Option<Instant>,
/// The instant at which this set of probes started to be sent.
///
/// Up to [`NUM_PROBES`] SHOULD be sent in the time range between this
/// timestamp plus [`PROBE_INTERVAL`].
probe_window_started_at: Option<Instant>,
/// The number of probes sent so far in this [`PROBE_INTERVAL`].
probes_started: u64,
}
@ -258,7 +263,7 @@ impl CircuitBreaker {
let now = Instant::now();
// Reset the probe count once per PROBE_INTERVAL.
match guard.last_probe {
match guard.probe_window_started_at {
// It is time to begin probing again.
Some(p) if now.duration_since(p) > PROBE_INTERVAL => {
debug!("remote unavailable, probing");
@ -270,7 +275,7 @@ impl CircuitBreaker {
// `guard.probes_started` if it has reached `NUM_PROBES`.
assert!(guard.probes_started <= NUM_PROBES);
// Record the start of a probing interval.
guard.last_probe = Some(now);
guard.probe_window_started_at = Some(now);
// Reset the number of probes allowed.
guard.probes_started = 0;
@ -295,7 +300,7 @@ impl CircuitBreaker {
None => {
// First time this circuit breaker has entered the probing
// state; no start of a probe interval to check.
guard.last_probe = Some(now);
guard.probe_window_started_at = Some(now);
// It should be impossible to have started probes if we've never
// been in the probing state before.
assert_eq!(guard.probes_started, 0);
@ -495,7 +500,7 @@ mod tests {
assert_reset_is_nop(&c.requests);
// Pretend it is time to probe again.
c.probes.lock().last_probe = Some(
c.probes.lock().probe_window_started_at = Some(
Instant::now()
.checked_sub(PROBE_INTERVAL + Duration::from_nanos(1))
.expect("instant cannot roll back far enough - test issue, not code issue"),
@ -565,7 +570,7 @@ mod tests {
assert_reset_is_nop(&c.requests);
// Pretend it is time to probe again.
c.probes.lock().last_probe = Some(
c.probes.lock().probe_window_started_at = Some(
Instant::now()
.checked_sub(PROBE_INTERVAL + Duration::from_nanos(1))
.expect("instant cannot roll back far enough - test issue, not code issue"),