nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 13:06:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bug 24769: Reduce and parameterize the cbt learning idle timeout.

Browse Source 
This is only half of the changes needed. We should also parameterize the
number of concurrent cbt learning circuits in needs_circuits_for_build().
This commit is contained in:
Mike Perry 2018-01-31 16:27:50 +00:00
parent f0d7905bc9
commit 148c2410af
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
changes/bug24769 Normal file
View File

@ -0,0 +1,7 @@
o Minor bugfixes (performance):
- Reduce the number of circuits that can be opened at once during the
circuit build timeout phase. This is done by increasing the idle timeout
to 3 minutes, and lowering the maximum number of concurrent learning
circuits to 10. Fixes Bug 24769; bugfix on 0.3.1.1-alpha.

18
src/or/circuitlist.c
View File

@ -897,8 +897,10 @@ init_circuit_base(circuit_t *circ)
/** If we haven't yet decided on a good timeout value for circuit /** If we haven't yet decided on a good timeout value for circuit
* building, we close idle circuits aggressively so we can get more * building, we close idle circuits aggressively so we can get more
* data points. */ * data points. These are the default, min, and max consensus values */
#define IDLE_TIMEOUT_WHILE_LEARNING (1*60) #define DFLT_IDLE_TIMEOUT_WHILE_LEARNING (3*60)
#define MIN_IDLE_TIMEOUT_WHILE_LEARNING (10)
#define MAX_IDLE_TIMEOUT_WHILE_LEARNING (1000*60)
/** Allocate space for a new circuit, initializing with <b>p_circ_id</b> /** Allocate space for a new circuit, initializing with <b>p_circ_id</b>
* and <b>p_conn</b>. Add it to the global circuit list. * and <b>p_conn</b>. Add it to the global circuit list.
@ -931,7 +933,11 @@ origin_circuit_new(void)
circuit_build_times_needs_circuits(get_circuit_build_times())) { circuit_build_times_needs_circuits(get_circuit_build_times())) {
/* Circuits should be shorter lived if we need more of them /* Circuits should be shorter lived if we need more of them
* for learning a good build timeout */ * for learning a good build timeout */
circ->circuit_idle_timeout = IDLE_TIMEOUT_WHILE_LEARNING; circ->circuit_idle_timeout =
networkstatus_get_param(NULL, "cbtlearntimeout",
DFLT_IDLE_TIMEOUT_WHILE_LEARNING,
MIN_IDLE_TIMEOUT_WHILE_LEARNING,
MAX_IDLE_TIMEOUT_WHILE_LEARNING);
} else { } else {
// This should always be larger than the current port prediction time // This should always be larger than the current port prediction time
// remaining, or else we'll end up with the case where a circuit times out // remaining, or else we'll end up with the case where a circuit times out
@ -951,7 +957,11 @@ origin_circuit_new(void)
"%d seconds of predictive building remaining.", "%d seconds of predictive building remaining.",
circ->circuit_idle_timeout, circ->circuit_idle_timeout,
prediction_time_remaining); prediction_time_remaining);
circ->circuit_idle_timeout = IDLE_TIMEOUT_WHILE_LEARNING; circ->circuit_idle_timeout =
networkstatus_get_param(NULL, "cbtlearntimeout",
DFLT_IDLE_TIMEOUT_WHILE_LEARNING,
MIN_IDLE_TIMEOUT_WHILE_LEARNING,
MAX_IDLE_TIMEOUT_WHILE_LEARNING);
} }
log_info(LD_CIRC, log_info(LD_CIRC,