Commit 87156e56 authored by Mike Perry's avatar Mike Perry
Browse files

HACK: Bump important CC logs to notice level

parent f5fc4ff3
Pipeline #9069 failed with stage
in 9 minutes and 44 seconds
......@@ -485,26 +485,26 @@ sendme_circ_has_pending_streams(circuit_t *circ, crypt_path_t *layer_hint)
if (!layer_hint || conn->cpath_layer == layer_hint) {
if (connection_get_inbuf_len(TO_CONN(conn)) > 0) {
log_info(LD_CIRC, "CC: More in edge inbuf...");
log_notice(LD_CIRC, "CC: More in edge inbuf...");
return 1;
}
/* If we did not reach EOF on this read, there's more */
if (!TO_CONN(conn)->inbuf_reached_eof) {
log_info(LD_CIRC, "CC: More on edge conn...");
log_notice(LD_CIRC, "CC: More on edge conn...");
return 1;
}
if (TO_CONN(conn)->linked_conn) {
if (connection_get_inbuf_len(TO_CONN(conn)->linked_conn) > 0) {
log_info(LD_CIRC, "CC: More in linked inbuf...");
log_notice(LD_CIRC, "CC: More in linked inbuf...");
return 1;
}
/* If there is a linked conn, and *it* did not each EOF,
* there's more */
if (!TO_CONN(conn)->linked_conn->inbuf_reached_eof) {
log_info(LD_CIRC, "CC: More on linked conn...");
log_notice(LD_CIRC, "CC: More on linked conn...");
return 1;
}
}
......@@ -601,7 +601,7 @@ sendme_update_circuit_bdp(circuit_t *circ, congestion_control_t *cc,
* the BDP, so preserve our old estimates but do not make any more.
*/
if (!blocked_on_chan && !sendme_circ_has_pending_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);
......@@ -658,8 +658,8 @@ sendme_update_circuit_bdp(circuit_t *circ, 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 */
......@@ -688,8 +688,8 @@ sendme_update_circuit_bdp(circuit_t *circ, 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(
......@@ -711,13 +711,13 @@ sendme_update_circuit_bdp(circuit_t *circ, congestion_control_t *cc,
if (!cc->bdp[BDP_ALG_PIECEWISE]) {
cc->bdp[BDP_ALG_PIECEWISE] = cc->bdp[BDP_ALG_CWND_RTT];
cc->bdp[BDP_ALG_PIECEWISE_EWMA] = cc->bdp[BDP_ALG_CWND_RTT_EWMA];
log_info(LD_CIRC, "CC: No piecewise BDP. Using %"PRIu64". Have %"PRIu64,
log_notice(LD_CIRC, "CC: No piecewise BDP. Using %"PRIu64". Have %"PRIu64,
cc->bdp[BDP_ALG_PIECEWISE], cc->bdp[BDP_ALG_INFLIGHT_RTT]);
}
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: "
......@@ -740,7 +740,7 @@ sendme_update_circuit_bdp(circuit_t *circ, congestion_control_t *cc,
cc->bdp[BDP_ALG_PIECEWISE_EWMA]
);
} else {
log_info(LD_CIRC,
log_notice(LD_CIRC,
"CC: Circuit %"PRIu64":%d "
"SENDME RTT: %"PRIu64", %"PRIu64", %"PRIu64", %"PRIu64", "
"%"PRIu64", "
......
......@@ -70,7 +70,7 @@ sendme_nola_process_circuit_level(crypt_path_t *layer_hint,
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", "
......@@ -83,7 +83,7 @@ sendme_nola_process_circuit_level(crypt_path_t *layer_hint,
cc->in_slow_start
);
} else {
log_info(LD_CIRC,
log_notice(LD_CIRC,
"CC TOR_NOLA: Circuit %"PRIu64":%d "
"CWND: %"PRIu64", "
"INFL: %"PRIu64", "
......
......@@ -90,7 +90,7 @@ sendme_vegas_process_circuit_level(crypt_path_t *layer_hint,
/* 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) {
......@@ -107,7 +107,7 @@ sendme_vegas_process_circuit_level(crypt_path_t *layer_hint,
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", "
......@@ -124,7 +124,7 @@ sendme_vegas_process_circuit_level(crypt_path_t *layer_hint,
cc->in_slow_start
);
} else {
log_info(LD_CIRC,
log_notice(LD_CIRC,
"CC: TOR_VEGAS Circuit %"PRIu64":%d "
"CWND: %"PRIu64", "
"INFL: %"PRIu64", "
......
......@@ -119,7 +119,7 @@ sendme_westwood_process_circuit_level(crypt_path_t *layer_hint,
// too.
cc->max_rtt_usec = WESTWOOD_MAX_RTT_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);
}
......@@ -130,7 +130,7 @@ sendme_westwood_process_circuit_level(crypt_path_t *layer_hint,
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", "
......@@ -147,7 +147,7 @@ sendme_westwood_process_circuit_level(crypt_path_t *layer_hint,
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