diff options
| author | David Goulet <dgoulet@torproject.org> | 2022-10-26 15:01:43 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2022-10-26 15:01:43 -0400 |
| commit | ca135a127d3641dde301eb7dfa4f50edce878a0e (patch) | |
| tree | 133c4fc250780a323fc2b3f98a9db2894864a4cb | |
| parent | 17207449045589f24eb3f6bedc598898832adecc (diff) | |
| parent | 0a49e04691b6f6efedadc003521cd0e5809f81da (diff) | |
| download | tor-ca135a127d3641dde301eb7dfa4f50edce878a0e.tar.gz tor-ca135a127d3641dde301eb7dfa4f50edce878a0e.zip | |
Merge branch 'maint-0.4.7'
| -rw-r--r-- | changes/bug40698 | 11 | ||||
| -rw-r--r-- | src/feature/dirauth/dirauth_options.inc | 3 | ||||
| -rw-r--r-- | src/feature/dirauth/dirvote.c | 3 | ||||
| -rw-r--r-- | src/feature/nodelist/fmt_routerstatus.c | 15 |
4 files changed, 25 insertions, 7 deletions
diff --git a/changes/bug40698 b/changes/bug40698 new file mode 100644 index 0000000000..98ddd4f968 --- /dev/null +++ b/changes/bug40698 @@ -0,0 +1,11 @@ + o Minor bugfixes (dirauth): + - Directory authorities stop voting a consensus "Measured" weight + for relays with the Authority flag. Now these relays will be + considered unmeasured, which should reserve their bandwidth + for their dir auth role and minimize distractions from other + roles. In place of the "Measured" weight, they now include a + "MeasuredButAuthority" weight (not used by anything) so the + bandwidth authority's opinion on this relay can be recorded for + posterity. Lastly, remove the AuthDirDontVoteOnDirAuthBandwidth + torrc option which never worked right. Fixes bugs 40698 and 40700; + bugfix on 0.4.7.2-alpha. diff --git a/src/feature/dirauth/dirauth_options.inc b/src/feature/dirauth/dirauth_options.inc index 7ee0201e1a..a43ed285ce 100644 --- a/src/feature/dirauth/dirauth_options.inc +++ b/src/feature/dirauth/dirauth_options.inc @@ -138,7 +138,4 @@ CONF_VAR(VersioningAuthoritativeDirectory, BOOL, 0, "0") * pressure or not. */ CONF_VAR(AuthDirRejectRequestsUnderLoad, BOOL, 0, "1") -/** Boolean: Should we not give bandwidth weight measurements to dirauths? */ -CONF_VAR(AuthDirDontVoteOnDirAuthBandwidth, BOOL, 0, "1") - END_CONF_STRUCT(dirauth_options_t) diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index b4a9f83f19..b9f022bebd 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -2317,8 +2317,7 @@ networkstatus_compute_consensus(smartlist_t *votes, smartlist_add_asprintf(chunks, "pr %s\n", chosen_protocol_list); } /* Now the weight line. */ - if (rs_out.has_bandwidth && (!rs_out.is_authority || - !dirauth_get_options()->AuthDirDontVoteOnDirAuthBandwidth)) { + if (rs_out.has_bandwidth) { char *guardfraction_str = NULL; int unmeasured = rs_out.bw_is_unmeasured; diff --git a/src/feature/nodelist/fmt_routerstatus.c b/src/feature/nodelist/fmt_routerstatus.c index e068c87c9b..4be2ec2a18 100644 --- a/src/feature/nodelist/fmt_routerstatus.c +++ b/src/feature/nodelist/fmt_routerstatus.c @@ -181,9 +181,20 @@ routerstatus_format_entry(const routerstatus_t *rs, const char *version, smartlist_add_asprintf(chunks, "w Bandwidth=%d", bw_kb); + /* Include the bandwidth weight from our external bandwidth + * authority, if we have one. */ if (format == NS_V3_VOTE && vrs && vrs->has_measured_bw) { - smartlist_add_asprintf(chunks, - " Measured=%d", vrs->measured_bw_kb); + if (!rs->is_authority) { /* normal case */ + smartlist_add_asprintf(chunks, + " Measured=%d", vrs->measured_bw_kb); + } else { + /* dir auth special case: don't give it a Measured line, so we + * can reserve its attention for authority-specific activities. + * But do include the bwauth's opinion so it can be recorded for + * posterity. See #40698 for details. */ + smartlist_add_asprintf(chunks, + " MeasuredButAuthority=%d", vrs->measured_bw_kb); + } } /* Write down guardfraction information if we have it. */ if (format == NS_V3_VOTE && vrs && vrs->status.has_guardfraction) { |