Final guardfraction preparations for upstream merge.

- Write a changes file.
- Change some logs to lesser severities.
This commit is contained in:
George Kadianakis 2015-01-29 15:49:23 +00:00 committed by Nick Mathewson
parent 028ede2f5e
commit 33053d50a0
5 changed files with 15 additions and 8 deletions

7
changes/bug9321 Normal file
View File

@ -0,0 +1,7 @@
o Major features:
- Introduce the Guardfraction feature which improves the load
balancing of path selection towards guard nodes. Specifically,
it aims to reduce the traffic gap that guard nodes experience
when they first get the Guard flag. This is a required step if
we want to increase the guard lifetime to 9 months or greater.
Resolves ticket 9321.

View File

@ -2436,7 +2436,7 @@ dirserv_read_guardfraction_file_from_str(const char *guardfraction_file_str,
retval = 0;
log_warn(LD_CONFIG,
log_info(LD_CONFIG,
"Successfully parsed guardfraction file with %d consensuses over "
"%d days. Parsed %d nodes and applied %d of them%s.",
total_consensuses, total_days, guards_read_n, guards_applied_n,

View File

@ -1020,7 +1020,7 @@ update_total_bandwidth_weights(const routerstatus_t *rs,
int guardfraction_bandwidth = 0;
if (!rs->has_bandwidth) {
log_warn(LD_BUG, "Missing consensus bandwidth for router %s",
log_info(LD_BUG, "Missing consensus bandwidth for router %s",
rs->nickname);
return;
}

View File

@ -2166,9 +2166,9 @@ compute_weighted_bandwidths(const smartlist_t *sl,
guardfraction_bw.guard_bw * weight +
guardfraction_bw.non_guard_bw * weight_without_guard_flag;
log_warn(LD_GENERAL, "%s: Guardfraction weight %f instead of %f (%s)",
node->rs->nickname, final_weight, weight*this_bw,
bandwidth_weight_rule_to_string(rule));
log_debug(LD_GENERAL, "%s: Guardfraction weight %f instead of %f (%s)",
node->rs->nickname, final_weight, weight*this_bw,
bandwidth_weight_rule_to_string(rule));
} else { /* no guardfraction information. calculate the weight normally. */
final_weight = weight*this_bw;
}

View File

@ -1831,9 +1831,9 @@ routerstatus_parse_guardfraction(const char *guardfraction_str,
return -1;
}
log_warn(LD_GENERAL, "[*] Parsed %s guardfraction '%s' for '%s'.",
is_consensus ? "consensus" : "vote",
guardfraction_str, rs->nickname);
log_debug(LD_GENERAL, "[*] Parsed %s guardfraction '%s' for '%s'.",
is_consensus ? "consensus" : "vote",
guardfraction_str, rs->nickname);
if (!is_consensus) { /* We are parsing a vote */
vote_rs->status.guardfraction_percentage = guardfraction;