Commit 55b8ad01 authored by Mike Perry's avatar Mike Perry
Browse files

HACK: Bump important CC logs to notice level

parent cfec0465
Pipeline #10175 failed with stage
in 25 minutes and 19 seconds
......@@ -621,7 +621,7 @@ time_delta_stalled_or_jumped(const congestion_control_t *cc,
/* If we have a 0 new_delta, that is definitely a monotime stall */
if (new_delta == 0) {
static ratelim_t stall_info_limit = RATELIM_INIT(60);
log_fn_ratelim(&stall_info_limit, LOG_INFO, LD_CIRC,
log_fn_ratelim(&stall_info_limit, LOG_NOTICE, LD_CIRC,
"Congestion control cannot measure RTT due to monotime stall.");
return true;
}
......@@ -795,7 +795,7 @@ congestion_control_update_circuit_bdp(congestion_control_t *cc,
* the BDP, so preserve our old estimates but do not make any more.
*/
if (!blocked_on_chan && !circuit_has_active_streams(circ, layer_hint)) {
log_info(LD_CIRC,
log_notice(LD_CIRC,
"CC: Streams drained. Spare package window: %"PRIu64
", no BDP update", cc->cwnd - cc->inflight);
......@@ -864,8 +864,8 @@ congestion_control_update_circuit_bdp(congestion_control_t *cc,
/* The orconn is blocked; use smaller of inflight vs SENDME */
if (blocked_on_chan) {
log_info(LD_CIRC, "CC: Streams blocked on circ channel. Chanq: %d",
chan_q);
log_notice(LD_CIRC, "CC: Streams blocked on circ channel. Chanq: %d",
chan_q);
/* A blocked channel is an immediate congestion signal, but it still
* happens only once per cwnd */
......@@ -886,8 +886,8 @@ congestion_control_update_circuit_bdp(congestion_control_t *cc,
if (cc->blocked_chan) {
cc->blocked_chan = 0;
cc->next_cc_event = 0;
log_info(LD_CIRC, "CC: Streams un-blocked on circ channel. Chanq: %d",
chan_q);
log_notice(LD_CIRC, "CC: Streams un-blocked on circ channel. Chanq: %d",
chan_q);
}
cc->bdp[BDP_ALG_PIECEWISE] = MAX(cc->bdp[BDP_ALG_SENDME_RATE],
......@@ -900,13 +900,13 @@ congestion_control_update_circuit_bdp(congestion_control_t *cc,
* to get a BDP. In these cases, use the cwnd method. */
if (!cc->bdp[BDP_ALG_PIECEWISE]) {
cc->bdp[BDP_ALG_PIECEWISE] = cc->bdp[BDP_ALG_CWND_RTT];
log_info(LD_CIRC, "CC: No piecewise BDP. Using %"PRIu64,
log_notice(LD_CIRC, "CC: No piecewise BDP. Using %"PRIu64,
cc->bdp[BDP_ALG_PIECEWISE]);
}
if (cc->next_cc_event == 0) {
if (CIRCUIT_IS_ORIGIN(circ)) {
log_info(LD_CIRC,
log_notice(LD_CIRC,
"CC: Circuit %d "
"SENDME RTT: %"PRIu64", %"PRIu64", %"PRIu64", %"PRIu64", "
"BDP estimates: "
......@@ -927,7 +927,7 @@ congestion_control_update_circuit_bdp(congestion_control_t *cc,
cc->bdp[BDP_ALG_PIECEWISE]
);
} else {
log_info(LD_CIRC,
log_notice(LD_CIRC,
"CC: Circuit %"PRIu64":%d "
"SENDME RTT: %"PRIu64", %"PRIu64", %"PRIu64", %"PRIu64", "
"%"PRIu64", "
......
......@@ -92,7 +92,7 @@ congestion_control_nola_process_sendme(congestion_control_t *cc,
cc->cwnd = MAX(cc->cwnd, cc->cwnd_min);
if (CIRCUIT_IS_ORIGIN(circ)) {
log_info(LD_CIRC,
log_notice(LD_CIRC,
"CC TOR_NOLA: Circuit %d "
"CWND: %"PRIu64", "
"INFL: %"PRIu64", "
......@@ -105,7 +105,7 @@ congestion_control_nola_process_sendme(congestion_control_t *cc,
cc->in_slow_start
);
} else {
log_info(LD_CIRC,
log_notice(LD_CIRC,
"CC TOR_NOLA: Circuit %"PRIu64":%d "
"CWND: %"PRIu64", "
"INFL: %"PRIu64", "
......
......@@ -140,7 +140,7 @@ congestion_control_vegas_process_sendme(congestion_control_t *cc,
/* Congestion signal: Fall back to Vegas equilibrium (BDP) */
cc->cwnd = vegas_bdp_mix(cc);
cc->in_slow_start = 0;
log_info(LD_CIRC, "CC: TOR_VEGAS exiting slow start");
log_notice(LD_CIRC, "CC: TOR_VEGAS exiting slow start");
}
} else {
if (queue_use > cc->vegas_params.beta || cc->blocked_chan) {
......@@ -157,7 +157,7 @@ congestion_control_vegas_process_sendme(congestion_control_t *cc,
cc->next_cc_event = CWND_UPDATE_RATE(cc);
if (CIRCUIT_IS_ORIGIN(circ)) {
log_info(LD_CIRC,
log_notice(LD_CIRC,
"CC: TOR_VEGAS Circuit %d "
"CWND: %"PRIu64", "
"INFL: %"PRIu64", "
......@@ -174,7 +174,7 @@ congestion_control_vegas_process_sendme(congestion_control_t *cc,
cc->in_slow_start
);
} else {
log_info(LD_CIRC,
log_notice(LD_CIRC,
"CC: TOR_VEGAS Circuit %"PRIu64":%d "
"CWND: %"PRIu64", "
"INFL: %"PRIu64", "
......
......@@ -177,7 +177,7 @@ congestion_control_westwood_process_sendme(congestion_control_t *cc,
// too.
cc->max_rtt_usec = westwood_rtt_max_backoff(cc);
log_info(LD_CIRC, "CC: TOR_WESTWOOD congestion. New max RTT: %"PRIu64,
log_notice(LD_CIRC, "CC: TOR_WESTWOOD congestion. New max RTT: %"PRIu64,
cc->max_rtt_usec/1000);
}
......@@ -188,7 +188,7 @@ congestion_control_westwood_process_sendme(congestion_control_t *cc,
cc->next_cc_event = CWND_UPDATE_RATE(cc);
if (CIRCUIT_IS_ORIGIN(circ)) {
log_info(LD_CIRC,
log_notice(LD_CIRC,
"CC: TOR_WESTWOOD Circuit %d "
"CWND: %"PRIu64", "
"INFL: %"PRIu64", "
......@@ -205,7 +205,7 @@ congestion_control_westwood_process_sendme(congestion_control_t *cc,
cc->in_slow_start
);
} else {
log_info(LD_CIRC,
log_notice(LD_CIRC,
"CC: TOR_WESTWOOD Circuit %"PRIu64":%d "
"CWND: %"PRIu64", "
"INFL: %"PRIu64", "
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment