June 2017 - tor-commits - lists.torproject.org

[tor/maint-0.3.1] Patch for 22720 from huyvq: exit(1) more often
by nickm＠torproject.org 26 Jun '17

26 Jun '17

commit d72cfb259dfc83fe88c8589d4c1302a252823182 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 26 14:14:56 2017 -0400 Patch for 22720 from huyvq: exit(1) more often See changes file for full details. --- changes/bug22720 | 9 +++++++++ src/or/control.c | 2 +- src/or/main.c | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/changes/bug22720 b/changes/bug22720 new file mode 100644 index 0000000..4893b57 --- /dev/null +++ b/changes/bug22720 @@ -0,0 +1,9 @@ + o Minor bugfixes (process behavior): + - When exiting because of an error, always exit with a nonzero + exit status. Previously, we would fail to report an error in + our exit status in cases related to lockfile contention, + __OwningControllerProcess failure, and Ed25519 key + initialization. Fixes bug 22720; bugfix on versions + 0.2.1.6-alpha, 0.2.2.28-beta, and 0.2.7.2-alpha + respectively. Reported by "f55jwk4f"; patch from "huyvq". + diff --git a/src/or/control.c b/src/or/control.c index 9454a7a..9bcf1ee 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -6506,7 +6506,7 @@ monitor_owning_controller_process(const char *process_spec) msg); owning_controller_process_spec = NULL; tor_cleanup(); - exit(0); + exit(1); } } diff --git a/src/or/main.c b/src/or/main.c index 9699c8d..cb24fd1 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1556,7 +1556,7 @@ check_ed_keys_callback(time_t now, const or_options_t *options) generate_ed_link_cert(options, now, new_signing_key > 0)) { log_err(LD_OR, "Unable to update Ed25519 keys! Exiting."); tor_cleanup(); - exit(0); + exit(1); } } return 30; @@ -3168,7 +3168,7 @@ try_locking(const or_options_t *options, int err_if_locked) r = try_locking(options, 0); if (r<0) { log_err(LD_GENERAL, "No, it's still there. Exiting."); - exit(0); + exit(1); } return r; }

1 0

[tor/master] Patch for 22720 from huyvq: exit(1) more often
by nickm＠torproject.org 26 Jun '17

26 Jun '17

commit d72cfb259dfc83fe88c8589d4c1302a252823182 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 26 14:14:56 2017 -0400 Patch for 22720 from huyvq: exit(1) more often See changes file for full details. --- changes/bug22720 | 9 +++++++++ src/or/control.c | 2 +- src/or/main.c | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/changes/bug22720 b/changes/bug22720 new file mode 100644 index 0000000..4893b57 --- /dev/null +++ b/changes/bug22720 @@ -0,0 +1,9 @@ + o Minor bugfixes (process behavior): + - When exiting because of an error, always exit with a nonzero + exit status. Previously, we would fail to report an error in + our exit status in cases related to lockfile contention, + __OwningControllerProcess failure, and Ed25519 key + initialization. Fixes bug 22720; bugfix on versions + 0.2.1.6-alpha, 0.2.2.28-beta, and 0.2.7.2-alpha + respectively. Reported by "f55jwk4f"; patch from "huyvq". + diff --git a/src/or/control.c b/src/or/control.c index 9454a7a..9bcf1ee 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -6506,7 +6506,7 @@ monitor_owning_controller_process(const char *process_spec) msg); owning_controller_process_spec = NULL; tor_cleanup(); - exit(0); + exit(1); } } diff --git a/src/or/main.c b/src/or/main.c index 9699c8d..cb24fd1 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1556,7 +1556,7 @@ check_ed_keys_callback(time_t now, const or_options_t *options) generate_ed_link_cert(options, now, new_signing_key > 0)) { log_err(LD_OR, "Unable to update Ed25519 keys! Exiting."); tor_cleanup(); - exit(0); + exit(1); } } return 30; @@ -3168,7 +3168,7 @@ try_locking(const or_options_t *options, int err_if_locked) r = try_locking(options, 0); if (r<0) { log_err(LD_GENERAL, "No, it's still there. Exiting."); - exit(0); + exit(1); } return r; }

1 0

[tor/release-0.3.1] Patch for 22720 from huyvq: exit(1) more often
by nickm＠torproject.org 26 Jun '17

26 Jun '17

commit d72cfb259dfc83fe88c8589d4c1302a252823182 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 26 14:14:56 2017 -0400 Patch for 22720 from huyvq: exit(1) more often See changes file for full details. --- changes/bug22720 | 9 +++++++++ src/or/control.c | 2 +- src/or/main.c | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/changes/bug22720 b/changes/bug22720 new file mode 100644 index 0000000..4893b57 --- /dev/null +++ b/changes/bug22720 @@ -0,0 +1,9 @@ + o Minor bugfixes (process behavior): + - When exiting because of an error, always exit with a nonzero + exit status. Previously, we would fail to report an error in + our exit status in cases related to lockfile contention, + __OwningControllerProcess failure, and Ed25519 key + initialization. Fixes bug 22720; bugfix on versions + 0.2.1.6-alpha, 0.2.2.28-beta, and 0.2.7.2-alpha + respectively. Reported by "f55jwk4f"; patch from "huyvq". + diff --git a/src/or/control.c b/src/or/control.c index 9454a7a..9bcf1ee 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -6506,7 +6506,7 @@ monitor_owning_controller_process(const char *process_spec) msg); owning_controller_process_spec = NULL; tor_cleanup(); - exit(0); + exit(1); } } diff --git a/src/or/main.c b/src/or/main.c index 9699c8d..cb24fd1 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1556,7 +1556,7 @@ check_ed_keys_callback(time_t now, const or_options_t *options) generate_ed_link_cert(options, now, new_signing_key > 0)) { log_err(LD_OR, "Unable to update Ed25519 keys! Exiting."); tor_cleanup(); - exit(0); + exit(1); } } return 30; @@ -3168,7 +3168,7 @@ try_locking(const or_options_t *options, int err_if_locked) r = try_locking(options, 0); if (r<0) { log_err(LD_GENERAL, "No, it's still there. Exiting."); - exit(0); + exit(1); } return r; }

1 0

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 26 Jun '17

26 Jun '17

commit c29a559e7ba36933cf9d6405017018c5817dde51 Merge: 06414b9 d72cfb2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 26 14:15:21 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22720 | 9 +++++++++ src/or/control.c | 2 +- src/or/main.c | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.3.1] Changes file for Bug 22212.
by nickm＠torproject.org 26 Jun '17

26 Jun '17

commit 0c4751b59150f5613aa1c69d8c3483535ba7d6d6 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jun 23 19:10:20 2017 -0400 Changes file for Bug 22212. --- changes/bug22212 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug22212 b/changes/bug22212 new file mode 100644 index 0000000..f92d670 --- /dev/null +++ b/changes/bug22212 @@ -0,0 +1,5 @@ + o Minor bugfixes (netflow padding logging): + - Demote a warn that was caused by libevent delays to info if + the padding is less than 4.5 seconds late, or notice if it is more + (4.5 seconds is the amount of time that a netflow record might + be emitted after, if we chose the maximum timeout). Fixes bug #22212.

1 0

[tor/maint-0.3.1] Demote a log message due to libevent delays.
by nickm＠torproject.org 26 Jun '17

26 Jun '17

commit 0592ee45fcb244f6fedf3d39867c8cb289f518e9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 21 16:30:53 2017 -0400 Demote a log message due to libevent delays. This is a side-effect of being single-threaded. The worst cases of this are actually Bug #16585. --- src/or/channelpadding.c | 16 +++++++++++++--- src/test/test_channelpadding.c | 2 -- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/or/channelpadding.c b/src/or/channelpadding.c index f5248e8..bed2489 100644 --- a/src/or/channelpadding.c +++ b/src/or/channelpadding.c @@ -530,10 +530,20 @@ channelpadding_compute_time_until_pad_for_netflow(channel_t *chan) >= chan->next_padding_time_ms) { int64_t ms_until_pad_for_netflow = chan->next_padding_time_ms - long_now; + /* If the padding time is in the past, that means that libevent delayed + * calling the once-per-second callback due to other work taking too long. + * See https://bugs.torproject.org/22212 and + * https://bugs.torproject.org/16585. This is a systemic problem + * with being single-threaded, but let's emit a notice if this + * is long enough in the past that we might have missed a netflow window, + * and allowed a router to emit a netflow frame, just so we don't forget + * about it entirely.. */ +#define NETFLOW_MISSED_WINDOW (150000 - DFLT_NETFLOW_INACTIVE_KEEPALIVE_HIGH) if (ms_until_pad_for_netflow < 0) { - log_warn(LD_BUG, - "Channel padding timeout scheduled "I64_FORMAT"ms in the past. " - "Did the monotonic clock just jump?", + int severity = (ms_until_pad_for_netflow < -NETFLOW_MISSED_WINDOW) + ? LOG_NOTICE : LOG_INFO; + log_fn(severity, LD_OR, + "Channel padding timeout scheduled "I64_FORMAT"ms in the past. ", I64_PRINTF_ARG(-ms_until_pad_for_netflow)); return 0; /* Clock jumped: Send padding now */ } diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c index 0a70184..3b88999 100644 --- a/src/test/test_channelpadding.c +++ b/src/test/test_channelpadding.c @@ -795,8 +795,6 @@ test_channelpadding_decide_to_pad_channel(void *arg) tried_to_write_cell = 0; chan->next_padding_time_ms = monotime_coarse_absolute_msec() - 100; decision = channelpadding_decide_to_pad_channel(chan); - expect_log_msg("Channel padding timeout scheduled 100ms in the past. " - "Did the monotonic clock just jump?\n"); tt_int_op(decision, OP_EQ, CHANNELPADDING_PADDING_SENT); tt_int_op(tried_to_write_cell, OP_EQ, 1); tt_assert(!chan->pending_padding_callback);

1 0

[tor/master] Demote a log message due to libevent delays.
by nickm＠torproject.org 26 Jun '17

26 Jun '17

commit 0592ee45fcb244f6fedf3d39867c8cb289f518e9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Jun 21 16:30:53 2017 -0400 Demote a log message due to libevent delays. This is a side-effect of being single-threaded. The worst cases of this are actually Bug #16585. --- src/or/channelpadding.c | 16 +++++++++++++--- src/test/test_channelpadding.c | 2 -- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/or/channelpadding.c b/src/or/channelpadding.c index f5248e8..bed2489 100644 --- a/src/or/channelpadding.c +++ b/src/or/channelpadding.c @@ -530,10 +530,20 @@ channelpadding_compute_time_until_pad_for_netflow(channel_t *chan) >= chan->next_padding_time_ms) { int64_t ms_until_pad_for_netflow = chan->next_padding_time_ms - long_now; + /* If the padding time is in the past, that means that libevent delayed + * calling the once-per-second callback due to other work taking too long. + * See https://bugs.torproject.org/22212 and + * https://bugs.torproject.org/16585. This is a systemic problem + * with being single-threaded, but let's emit a notice if this + * is long enough in the past that we might have missed a netflow window, + * and allowed a router to emit a netflow frame, just so we don't forget + * about it entirely.. */ +#define NETFLOW_MISSED_WINDOW (150000 - DFLT_NETFLOW_INACTIVE_KEEPALIVE_HIGH) if (ms_until_pad_for_netflow < 0) { - log_warn(LD_BUG, - "Channel padding timeout scheduled "I64_FORMAT"ms in the past. " - "Did the monotonic clock just jump?", + int severity = (ms_until_pad_for_netflow < -NETFLOW_MISSED_WINDOW) + ? LOG_NOTICE : LOG_INFO; + log_fn(severity, LD_OR, + "Channel padding timeout scheduled "I64_FORMAT"ms in the past. ", I64_PRINTF_ARG(-ms_until_pad_for_netflow)); return 0; /* Clock jumped: Send padding now */ } diff --git a/src/test/test_channelpadding.c b/src/test/test_channelpadding.c index 0a70184..3b88999 100644 --- a/src/test/test_channelpadding.c +++ b/src/test/test_channelpadding.c @@ -795,8 +795,6 @@ test_channelpadding_decide_to_pad_channel(void *arg) tried_to_write_cell = 0; chan->next_padding_time_ms = monotime_coarse_absolute_msec() - 100; decision = channelpadding_decide_to_pad_channel(chan); - expect_log_msg("Channel padding timeout scheduled 100ms in the past. " - "Did the monotonic clock just jump?\n"); tt_int_op(decision, OP_EQ, CHANNELPADDING_PADDING_SENT); tt_int_op(tried_to_write_cell, OP_EQ, 1); tt_assert(!chan->pending_padding_callback);

1 0

[tor/master] Changes file for Bug 22212.
by nickm＠torproject.org 26 Jun '17

26 Jun '17

commit 0c4751b59150f5613aa1c69d8c3483535ba7d6d6 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jun 23 19:10:20 2017 -0400 Changes file for Bug 22212. --- changes/bug22212 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug22212 b/changes/bug22212 new file mode 100644 index 0000000..f92d670 --- /dev/null +++ b/changes/bug22212 @@ -0,0 +1,5 @@ + o Minor bugfixes (netflow padding logging): + - Demote a warn that was caused by libevent delays to info if + the padding is less than 4.5 seconds late, or notice if it is more + (4.5 seconds is the amount of time that a netflow record might + be emitted after, if we chose the maximum timeout). Fixes bug #22212.

1 0

[tor/maint-0.3.1] Merge branch 'bug22212_squashed' into maint-0.3.1
by nickm＠torproject.org 26 Jun '17

26 Jun '17

commit 8f59661dbaa25b54a9fad8a8dc5322a7778a7fc7 Merge: 0c7c494 0c4751b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 26 11:27:09 2017 -0400 Merge branch 'bug22212_squashed' into maint-0.3.1 changes/bug22212 | 5 +++++ src/or/channelpadding.c | 16 +++++++++++++--- src/test/test_channelpadding.c | 2 -- 3 files changed, 18 insertions(+), 5 deletions(-)

1 0

[tor/release-0.3.1] Merge branch 'bug22212_squashed' into maint-0.3.1
by nickm＠torproject.org 26 Jun '17

26 Jun '17

commit 8f59661dbaa25b54a9fad8a8dc5322a7778a7fc7 Merge: 0c7c494 0c4751b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 26 11:27:09 2017 -0400 Merge branch 'bug22212_squashed' into maint-0.3.1 changes/bug22212 | 5 +++++ src/or/channelpadding.c | 16 +++++++++++++--- src/test/test_channelpadding.c | 2 -- 3 files changed, 18 insertions(+), 5 deletions(-)

1 0