Lower min circ timeout from 1.5s to bin width (10ms)

This commit is contained in:
Mike Perry 2020-10-21 18:17:30 -05:00
parent 37b2159150
commit 761dd9f2ab
2 changed files with 3 additions and 3 deletions

View File

@ -1794,7 +1794,7 @@ circuit_build_times_set_timeout(circuit_build_times_t *cbt)
return; return;
if (cbt->timeout_ms < circuit_build_times_min_timeout()) { if (cbt->timeout_ms < circuit_build_times_min_timeout()) {
log_info(LD_CIRC, "Set buildtimeout to low value %fms. Setting to %dms", log_notice(LD_CIRC, "Set buildtimeout to low value %fms. Setting to %dms",
cbt->timeout_ms, circuit_build_times_min_timeout()); cbt->timeout_ms, circuit_build_times_min_timeout());
cbt->timeout_ms = circuit_build_times_min_timeout(); cbt->timeout_ms = circuit_build_times_min_timeout();
if (cbt->close_ms < cbt->timeout_ms) { if (cbt->close_ms < cbt->timeout_ms) {

View File

@ -119,8 +119,8 @@ double circuit_build_times_quantile_cutoff(void);
#define CBT_MAX_TEST_FREQUENCY INT32_MAX #define CBT_MAX_TEST_FREQUENCY INT32_MAX
/** Lowest allowable value for CircuitBuildTimeout in milliseconds */ /** Lowest allowable value for CircuitBuildTimeout in milliseconds */
#define CBT_DEFAULT_TIMEOUT_MIN_VALUE (1500) #define CBT_DEFAULT_TIMEOUT_MIN_VALUE (CBT_BIN_WIDTH)
#define CBT_MIN_TIMEOUT_MIN_VALUE 500 #define CBT_MIN_TIMEOUT_MIN_VALUE CBT_BIN_WIDTH
#define CBT_MAX_TIMEOUT_MIN_VALUE INT32_MAX #define CBT_MAX_TIMEOUT_MIN_VALUE INT32_MAX
/** Initial circuit build timeout in milliseconds */ /** Initial circuit build timeout in milliseconds */