- tor-commits - lists.torproject.org

[tor/maint-0.2.2] Merge remote-tracking branch 'arma/bug3012' into maint-0.2.2
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit f0d9e2d6507adcc069b38cd9e0aaf6702f576314 Merge: 4010427 66de6f7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 28 21:15:14 2011 -0400 Merge remote-tracking branch 'arma/bug3012' into maint-0.2.2 changes/bug3012 | 5 +++++ src/or/config.c | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.2] relays checkpoint their state file twice a day
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit 66de6f7eb8e2948f6c3849dbca20c7b31969b5b7 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Apr 28 21:06:25 2011 -0400 relays checkpoint their state file twice a day --- changes/bug3012 | 5 +++++ src/or/config.c | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/changes/bug3012 b/changes/bug3012 new file mode 100644 index 0000000..dfde5fa --- /dev/null +++ b/changes/bug3012 @@ -0,0 +1,5 @@ + o Minor features: + - Relays can go for weeks without writing out their state file. A + relay that crashes would lose its bandwidth history (including + capacity estimate), client country statistics, and so on. Now relays + checkpoint the file at least every 12 hours. Addresses bug 3012. diff --git a/src/or/config.c b/src/or/config.c index 9384b3a..dc24140 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5122,6 +5122,11 @@ or_state_load(void) /** If writing the state to disk fails, try again after this many seconds. */ #define STATE_WRITE_RETRY_INTERVAL 3600 +/** If we're a relay, how often should we checkpoint our state file even + * if nothing else dirties it? This will checkpoint ongoing stats like + * bandwidth used, per-country user stats, etc. */ +#define STATE_RELAY_CHECKPOINT_INTERVAL (12*60*60) + /** Write the persistent state to disk. Return 0 for success, <0 on failure. */ int or_state_save(time_t now) @@ -5172,7 +5177,11 @@ or_state_save(time_t now) tor_free(fname); tor_free(contents); - global_state->next_write = TIME_MAX; + if (server_mode(get_options())) + global_state->next_write = now + STATE_RELAY_CHECKPOINT_INTERVAL; + else + global_state->next_write = TIME_MAX; + return 0; }

1 0

[tor/master] Merge remote-tracking branch 'arma/bug3039' into maint-0.2.2
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit 4010427b519c3727351905bbe5a75e85a055dd58 Merge: 5693fed df3cf88 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 28 20:53:44 2011 -0400 Merge remote-tracking branch 'arma/bug3039' into maint-0.2.2 changes/bug3039 | 5 +++++ src/or/circuitbuild.c | 2 +- src/or/config.c | 20 +++++++++++++++++--- src/or/config.h | 1 + 4 files changed, 24 insertions(+), 4 deletions(-)

1 0

[tor/master] stop putting wacky values into state->lastwritten
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit df3cf881d1d217b6ff3757bf95f8c2784584fec8 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Apr 28 20:40:15 2011 -0400 stop putting wacky values into state->lastwritten --- changes/bug3039 | 5 +++++ src/or/circuitbuild.c | 2 +- src/or/config.c | 20 +++++++++++++++++--- src/or/config.h | 1 + 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/changes/bug3039 b/changes/bug3039 new file mode 100644 index 0000000..7347ee3 --- /dev/null +++ b/changes/bug3039 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Write the current time into the LastWritten line in our state file, + rather than the time from the previous write attempt. Also, stop + trying to use a time of -1 in our log statements. Fixes bug 3039; + bugfix on 0.2.2.14-alpha. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index fe94264..85765e3 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -119,7 +119,7 @@ circuit_build_times_disabled(void) 0, 0, 1); int config_disabled = !get_options()->LearnCircuitBuildTimeout; int dirauth_disabled = get_options()->AuthoritativeDir; - int state_disabled = (get_or_state()->LastWritten == -1); + int state_disabled = did_last_state_file_write_fail() ? 1 : 0; if (consensus_disabled || config_disabled || dirauth_disabled || state_disabled) { diff --git a/src/or/config.c b/src/or/config.c index 9384b3a..7534cc7 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5119,6 +5119,18 @@ or_state_load(void) return r; } +/** Did the last time we tried to write the state file fail? If so, we + * should consider disabling such features as preemptive circuit generation + * to compute circuit-build-time. */ +static int last_state_file_write_failed = 0; + +/** Return whether the state file failed to write last time we tried. */ +int +did_last_state_file_write_fail(void) +{ + return last_state_file_write_failed; +} + /** If writing the state to disk fails, try again after this many seconds. */ #define STATE_WRITE_RETRY_INTERVAL 3600 @@ -5143,11 +5155,13 @@ or_state_save(time_t now) if (accounting_is_enabled(get_options())) accounting_run_housekeeping(now); + global_state->LastWritten = now; + tor_free(global_state->TorVersion); tor_asprintf(&global_state->TorVersion, "Tor %s", get_version()); state = config_dump(&state_format, global_state, 1, 0); - format_local_iso_time(tbuf, time(NULL)); + format_local_iso_time(tbuf, now); tor_asprintf(&contents, "# Tor state file last generated on %s local time\n" "# Other times below are in GMT\n" @@ -5158,7 +5172,7 @@ or_state_save(time_t now) if (write_str_to_file(fname, contents, 0)<0) { log_warn(LD_FS, "Unable to write state to file \"%s\"; " "will try again later", fname); - global_state->LastWritten = -1; + last_state_file_write_failed = 1; tor_free(fname); tor_free(contents); /* Try again after STATE_WRITE_RETRY_INTERVAL (or sooner, if the state @@ -5167,7 +5181,7 @@ or_state_save(time_t now) return -1; } - global_state->LastWritten = time(NULL); + last_state_file_write_failed = 0; log_info(LD_GENERAL, "Saved state to \"%s\"", fname); tor_free(fname); tor_free(contents); diff --git a/src/or/config.h b/src/or/config.h index defda35..78a67dd 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -58,6 +58,7 @@ char *options_get_datadir_fname2_suffix(or_options_t *options, get_datadir_fname2_suffix((sub1), NULL, (suffix)) or_state_t *get_or_state(void); +int did_last_state_file_write_fail(void); int or_state_save(time_t now); int options_need_geoip_info(or_options_t *options, const char **reason_out);

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit b0a7e0d6ca45bef3c5836d9082dcc9461cee6c9c Merge: 9d67d16 4010427 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 28 20:55:03 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug3039 | 5 +++++ src/or/circuitbuild.c | 2 +- src/or/config.c | 20 +++++++++++++++++--- src/or/config.h | 1 + 4 files changed, 24 insertions(+), 4 deletions(-) diff --cc src/or/config.h index 7f0a3d1,78a67dd..49f7e25 --- a/src/or/config.h +++ b/src/or/config.h @@@ -57,9 -57,8 +57,10 @@@ char *options_get_datadir_fname2_suffix #define get_datadir_fname_suffix(sub1, suffix) \ get_datadir_fname2_suffix((sub1), NULL, (suffix)) +int get_num_cpus(const or_options_t *options); + or_state_t *get_or_state(void); + int did_last_state_file_write_fail(void); int or_state_save(time_t now); int options_need_geoip_info(or_options_t *options, const char **reason_out);

1 0

[tor/maint-0.2.2] stop putting wacky values into state->lastwritten
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit df3cf881d1d217b6ff3757bf95f8c2784584fec8 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Apr 28 20:40:15 2011 -0400 stop putting wacky values into state->lastwritten --- changes/bug3039 | 5 +++++ src/or/circuitbuild.c | 2 +- src/or/config.c | 20 +++++++++++++++++--- src/or/config.h | 1 + 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/changes/bug3039 b/changes/bug3039 new file mode 100644 index 0000000..7347ee3 --- /dev/null +++ b/changes/bug3039 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Write the current time into the LastWritten line in our state file, + rather than the time from the previous write attempt. Also, stop + trying to use a time of -1 in our log statements. Fixes bug 3039; + bugfix on 0.2.2.14-alpha. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index fe94264..85765e3 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -119,7 +119,7 @@ circuit_build_times_disabled(void) 0, 0, 1); int config_disabled = !get_options()->LearnCircuitBuildTimeout; int dirauth_disabled = get_options()->AuthoritativeDir; - int state_disabled = (get_or_state()->LastWritten == -1); + int state_disabled = did_last_state_file_write_fail() ? 1 : 0; if (consensus_disabled || config_disabled || dirauth_disabled || state_disabled) { diff --git a/src/or/config.c b/src/or/config.c index 9384b3a..7534cc7 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -5119,6 +5119,18 @@ or_state_load(void) return r; } +/** Did the last time we tried to write the state file fail? If so, we + * should consider disabling such features as preemptive circuit generation + * to compute circuit-build-time. */ +static int last_state_file_write_failed = 0; + +/** Return whether the state file failed to write last time we tried. */ +int +did_last_state_file_write_fail(void) +{ + return last_state_file_write_failed; +} + /** If writing the state to disk fails, try again after this many seconds. */ #define STATE_WRITE_RETRY_INTERVAL 3600 @@ -5143,11 +5155,13 @@ or_state_save(time_t now) if (accounting_is_enabled(get_options())) accounting_run_housekeeping(now); + global_state->LastWritten = now; + tor_free(global_state->TorVersion); tor_asprintf(&global_state->TorVersion, "Tor %s", get_version()); state = config_dump(&state_format, global_state, 1, 0); - format_local_iso_time(tbuf, time(NULL)); + format_local_iso_time(tbuf, now); tor_asprintf(&contents, "# Tor state file last generated on %s local time\n" "# Other times below are in GMT\n" @@ -5158,7 +5172,7 @@ or_state_save(time_t now) if (write_str_to_file(fname, contents, 0)<0) { log_warn(LD_FS, "Unable to write state to file \"%s\"; " "will try again later", fname); - global_state->LastWritten = -1; + last_state_file_write_failed = 1; tor_free(fname); tor_free(contents); /* Try again after STATE_WRITE_RETRY_INTERVAL (or sooner, if the state @@ -5167,7 +5181,7 @@ or_state_save(time_t now) return -1; } - global_state->LastWritten = time(NULL); + last_state_file_write_failed = 0; log_info(LD_GENERAL, "Saved state to \"%s\"", fname); tor_free(fname); tor_free(contents); diff --git a/src/or/config.h b/src/or/config.h index defda35..78a67dd 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -58,6 +58,7 @@ char *options_get_datadir_fname2_suffix(or_options_t *options, get_datadir_fname2_suffix((sub1), NULL, (suffix)) or_state_t *get_or_state(void); +int did_last_state_file_write_fail(void); int or_state_save(time_t now); int options_need_geoip_info(or_options_t *options, const char **reason_out);

1 0

[tor/maint-0.2.2] Merge remote-tracking branch 'arma/bug3039' into maint-0.2.2
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit 4010427b519c3727351905bbe5a75e85a055dd58 Merge: 5693fed df3cf88 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 28 20:53:44 2011 -0400 Merge remote-tracking branch 'arma/bug3039' into maint-0.2.2 changes/bug3039 | 5 +++++ src/or/circuitbuild.c | 2 +- src/or/config.c | 20 +++++++++++++++++--- src/or/config.h | 1 + 4 files changed, 24 insertions(+), 4 deletions(-)

1 0

[tor/master] Clarify comment to say which version fixed 2722
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit 5693fedb60ee19048d45ed892edb07925b52678b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 28 20:38:15 2011 -0400 Clarify comment to say which version fixed 2722 --- src/or/dirserv.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 525524c..c8dda66 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1812,7 +1812,8 @@ dirserv_thinks_router_is_hs_dir(routerinfo_t *router, time_t now) * correctly, we can revert to only checking dir_port if router's * version is too old. */ /* XXX Unfortunately, we need to keep checking dir_port until all - * *clients* suffering from bug 2722 are obsolete. */ + * *clients* suffering from bug 2722 are obsolete. The first version + * to fix the bug was 0.2.2.25-alpha. */ return (router->wants_to_be_hs_dir && router->dir_port && uptime > get_options()->MinUptimeHidServDirectoryV2 && router->is_running);

1 0

[tor/master] Merge remote-tracking branches 'rransom/bug2722' and 'rransom/bug2722b' into maint-0.2.2
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit 6b9aadd557de171f0de7b700ba427a9a37a545fa Merge: c122897 eb50e3d 134da2f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 28 20:36:38 2011 -0400 Merge remote-tracking branches 'rransom/bug2722' and 'rransom/bug2722b' into maint-0.2.2 changes/bug2722 | 11 +++++++++++ src/or/dirserv.c | 2 ++ src/or/routerlist.c | 10 ++-------- 3 files changed, 15 insertions(+), 8 deletions(-) diff --cc src/or/routerlist.c index d9f099b,5e9c82a,4deff53..f567ccd --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@@@ -506,36 -463,37 -506,36 +506,36 @@@@ authority_certs_fetch_missing(networkst !digestmap_get(pending, voter->identity_digest)) { log_notice(LD_DIR, "We're missing a certificate from authority " "with signing key %s: launching request.", - hex_str(voter->signing_key_digest, DIGEST_LEN)); - smartlist_add(missing_digests, voter->identity_digest); + hex_str(sig->signing_key_digest, DIGEST_LEN)); + smartlist_add(missing_digests, sig->identity_digest); } - }); + } SMARTLIST_FOREACH_END(sig); + } SMARTLIST_FOREACH_END(voter); } - SMARTLIST_FOREACH(trusted_dir_servers, trusted_dir_server_t *, ds, - { - int found = 0; - if (!(ds->type & V3_AUTHORITY)) - continue; - if (smartlist_digest_isin(missing_digests, ds->v3_identity_digest)) - continue; - cl = get_cert_list(ds->v3_identity_digest); - SMARTLIST_FOREACH(cl->certs, authority_cert_t *, cert, - { - if (!ftime_definitely_after(now, cert->expires)) { - /* It's not expired, and we weren't looking for something to - * verify a consensus with. Call it done. */ - download_status_reset(&cl->dl_status); - found = 1; - break; - } - }); - if (!found && - download_status_is_ready(&cl->dl_status, now,MAX_CERT_DL_FAILURES) && - !digestmap_get(pending, ds->v3_identity_digest)) { - log_notice(LD_DIR, "No current certificate known for authority %s; " - "launching request.", ds->nickname); - smartlist_add(missing_digests, ds->v3_identity_digest); + SMARTLIST_FOREACH_BEGIN(trusted_dir_servers, trusted_dir_server_t *, ds) { + int found = 0; + if (!(ds->type & V3_AUTHORITY)) + continue; + if (smartlist_digest_isin(missing_digests, ds->v3_identity_digest)) + continue; + cl = get_cert_list(ds->v3_identity_digest); + SMARTLIST_FOREACH(cl->certs, authority_cert_t *, cert, { + if (now < cert->expires) { + /* It's not expired, and we weren't looking for something to + * verify a consensus with. Call it done. */ + download_status_reset(&cl->dl_status); + found = 1; + break; } }); + if (!found && + download_status_is_ready(&cl->dl_status, now,MAX_CERT_DL_FAILURES) && + !digestmap_get(pending, ds->v3_identity_digest)) { - log_notice(LD_DIR, "No current certificate known for authority %s; " - "launching request.", ds->nickname); ++ log_info(LD_DIR, "No current certificate known for authority %s; " ++ "launching request.", ds->nickname); + smartlist_add(missing_digests, ds->v3_identity_digest); + } + } SMARTLIST_FOREACH_END(ds); if (!smartlist_len(missing_digests)) { goto done; @@@@ -5594,14 -5192,9 -5550,13 +5594,14 @@@@ routerset_get_all_routers(smartlist_t * } } - /** Add to target every routerinfo_t from source that is in - * include, but not excluded in a more specific fashion by - * exclude. If running_only, only include running routers. ++#if 0 + /** Add to target every routerinfo_t from source except: + * + * 1) Don't add it if include is non-empty and the relay isn't in + * include; and + * 2) Don't add it if exclude is non-empty and the relay is + * excluded in a more specific fashion by exclude. + * 3) If running_only, don't add non-running routers. */ void routersets_get_disjunction(smartlist_t *target,

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 29 Apr '11

29 Apr '11

commit 9d67d16c6a99c662f0fe81068f66de471b39a616 Merge: bb8689b 5693fed Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 28 20:38:50 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug2722 | 11 +++++++++++ src/or/dirserv.c | 3 +++ src/or/routerlist.c | 10 ++-------- 3 files changed, 16 insertions(+), 8 deletions(-) diff --cc src/or/dirserv.c index 759b1cf,c8dda66..bbd25da --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@@ -1839,9 -1811,12 +1839,12 @@@ dirserv_thinks_router_is_hs_dir(const r * bug 1693. In the future, once relays set wants_to_be_hs_dir * correctly, we can revert to only checking dir_port if router's * version is too old. */ + /* XXX Unfortunately, we need to keep checking dir_port until all + * *clients* suffering from bug 2722 are obsolete. The first version + * to fix the bug was 0.2.2.25-alpha. */ return (router->wants_to_be_hs_dir && router->dir_port && uptime > get_options()->MinUptimeHidServDirectoryV2 && - router->is_running); + node->is_running); } /** Look through the routerlist, the Mean Time Between Failure history, and

1 0