Final guardfraction preparations for upstream merge.

- Write a changes file.
- Change some logs to lesser severities.

diff --git a/changes/bug9321 b/changes/bug9321
new file mode 100644 (file)
index 0000000..9826084
--- /dev/null
+++ b/changes/bug9321
@@ -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.

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 10b9e638940d052988350a5d0c9347665307e6aa..9939c31c6e01a4a0ceb597924c33ebefdedf3c9a 100644 (file)
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -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,

diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 0e4848570269e49895b449290587e4c79f05a480..8a73bebe537ac33d1b4198fb1f311a0e4cb3036b 100644 (file)
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -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;
   }

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 61b2f74a1845e6bd817ae50358ce2ff88dacd894..41fdb7a4bd9258a8eb9d6f8a6c97641fdf5acad3 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -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;
     }

diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 8a005447422e22bdcd601c417d1128fdfc61b0de..93274fa4f357c9ef890e29cd57e20ac7e7dd6729 100644 (file)
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -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;