April 2013 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'public/bug8185_diagnostic' into maint-0.2.4
by nickm＠torproject.org 11 Apr '13

11 Apr '13

commit 922ab0883d2f037d18cfc02083c68777e4dfb349 Merge: ee3cc44 7d1ade2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 11 01:46:28 2013 -0400 Merge remote-tracking branch 'public/bug8185_diagnostic' into maint-0.2.4 changes/bug8185_diagnostic | 3 +++ src/or/relay.c | 22 +++++++++++++++------- src/or/relay.h | 10 ++++++++-- 3 files changed, 26 insertions(+), 9 deletions(-)

1 0

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

11 Apr '13

commit e54a5a4f3c65dc8ab5470a91a48f500982b7d10e Merge: 1b026ef 922ab08 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 11 01:47:10 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug8185_diagnostic | 3 +++ src/or/relay.c | 22 +++++++++++++++------- src/or/relay.h | 10 ++++++++-- 3 files changed, 26 insertions(+), 9 deletions(-)

1 0

[tor/maint-0.2.4] Debugging log for bug 8185
by nickm＠torproject.org 11 Apr '13

11 Apr '13

commit 7d1ade251bad76c82b3f1288097587e0fbd1c4ae Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 19 17:00:40 2013 -0400 Debugging log for bug 8185 If the bug recurs, log the filename and line number that triggered it --- changes/bug8185_diagnostic | 3 +++ src/or/relay.c | 22 +++++++++++++++------- src/or/relay.h | 10 ++++++++-- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/changes/bug8185_diagnostic b/changes/bug8185_diagnostic new file mode 100644 index 0000000..b0f8884 --- /dev/null +++ b/changes/bug8185_diagnostic @@ -0,0 +1,3 @@ + o Minor features: + - Improve debugging output to attempt to diagnose the underlying + cause of bug 8185. diff --git a/src/or/relay.c b/src/or/relay.c index 1da9932..c71fe2a 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -379,15 +379,22 @@ relay_crypt(circuit_t *circ, cell_t *cell, cell_direction_t cell_direction, static int circuit_package_relay_cell(cell_t *cell, circuit_t *circ, cell_direction_t cell_direction, - crypt_path_t *layer_hint, streamid_t on_stream) + crypt_path_t *layer_hint, streamid_t on_stream, + const char *filename, int lineno) { channel_t *chan; /* where to send the cell */ if (cell_direction == CELL_DIRECTION_OUT) { crypt_path_t *thishop; /* counter for repeated crypts */ chan = circ->n_chan; - if (!CIRCUIT_IS_ORIGIN(circ) || !chan) { - log_warn(LD_BUG,"outgoing relay cell has n_chan==NULL. Dropping."); + if (!chan) { + log_warn(LD_BUG,"outgoing relay cell sent from %s:%d has n_chan==NULL." + " Dropping.", filename, lineno); + return 0; /* just drop it */ + } + if (!CIRCUIT_IS_ORIGIN(circ)) { + log_warn(LD_BUG,"outgoing relay cell sent from %s:%d on non-origin " + "circ. Dropping.", filename, lineno); return 0; /* just drop it */ } @@ -548,9 +555,10 @@ relay_command_to_string(uint8_t command) * return 0. */ int -relay_send_command_from_edge(streamid_t stream_id, circuit_t *circ, - uint8_t relay_command, const char *payload, - size_t payload_len, crypt_path_t *cpath_layer) +relay_send_command_from_edge_(streamid_t stream_id, circuit_t *circ, + uint8_t relay_command, const char *payload, + size_t payload_len, crypt_path_t *cpath_layer, + const char *filename, int lineno) { cell_t cell; relay_header_t rh; @@ -633,7 +641,7 @@ relay_send_command_from_edge(streamid_t stream_id, circuit_t *circ, } if (circuit_package_relay_cell(&cell, circ, cell_direction, cpath_layer, - stream_id) < 0) { + stream_id, filename, lineno) < 0) { log_warn(LD_BUG,"circuit_package_relay_cell failed. Closing."); circuit_mark_for_close(circ, END_CIRC_REASON_INTERNAL); return -1; diff --git a/src/or/relay.h b/src/or/relay.h index 7e59838..229fb4f 100644 --- a/src/or/relay.h +++ b/src/or/relay.h @@ -20,9 +20,15 @@ int circuit_receive_relay_cell(cell_t *cell, circuit_t *circ, void relay_header_pack(uint8_t *dest, const relay_header_t *src); void relay_header_unpack(relay_header_t *dest, const uint8_t *src); -int relay_send_command_from_edge(streamid_t stream_id, circuit_t *circ, +int relay_send_command_from_edge_(streamid_t stream_id, circuit_t *circ, uint8_t relay_command, const char *payload, - size_t payload_len, crypt_path_t *cpath_layer); + size_t payload_len, crypt_path_t *cpath_layer, + const char *filename, int lineno); +#define relay_send_command_from_edge(stream_id, circ, relay_command, payload, \ + payload_len, cpath_layer) \ + relay_send_command_from_edge_((stream_id), (circ), (relay_command), \ + (payload), (payload_len), (cpath_layer), \ + __FILE__, __LINE__) int connection_edge_send_command(edge_connection_t *fromconn, uint8_t relay_command, const char *payload, size_t payload_len);

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'public/bug8185_diagnostic' into maint-0.2.4
by nickm＠torproject.org 11 Apr '13

11 Apr '13

commit 922ab0883d2f037d18cfc02083c68777e4dfb349 Merge: ee3cc44 7d1ade2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 11 01:46:28 2013 -0400 Merge remote-tracking branch 'public/bug8185_diagnostic' into maint-0.2.4 changes/bug8185_diagnostic | 3 +++ src/or/relay.c | 22 +++++++++++++++------- src/or/relay.h | 10 ++++++++-- 3 files changed, 26 insertions(+), 9 deletions(-)

1 0

[tor/master] Make control_event_bootstrap_problem always INFO when hibernating
by nickm＠torproject.org 11 Apr '13

11 Apr '13

commit 805ecb8719e5e66d708f040027fecc6de56b3a5b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 20:52:20 2013 -0400 Make control_event_bootstrap_problem always INFO when hibernating When we're hibernating, the main reqason we can't bootstrap will always be that we're hibernating: reporting anything else at severity WARN is pointless. Fixes part of 7302. --- changes/bug7302 | 8 +++++++- src/or/control.c | 3 +++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/changes/bug7302 b/changes/bug7302 index 2949e40..fec615f 100644 --- a/changes/bug7302 +++ b/changes/bug7302 @@ -2,4 +2,10 @@ - Don't log inappropriate heartbeat messages when hibernating: a hibernating node is _expected_ to drop out of the consensus, decide it isn't bootstrapped, and so forth. Fixes part of bug - #7302; bugfix on 0.2.3.1-alpha. + 7302; bugfix on 0.2.3.1-alpha. + + - Don't complain about bootstrapping problems while hibernating. + These complaints reflect a general code problems, but not one + with any problematic effects. (No connections are actually + opened.) Fixes part of bug 7302; bugfix on 0.2.3.2-alpha. + diff --git a/src/or/control.c b/src/or/control.c index 03e5d79..5e61cd7 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4717,6 +4717,9 @@ control_event_bootstrap_problem(const char *warn, int reason) !any_pending_bridge_descriptor_fetches()) recommendation = "warn"; + if (we_are_hibernating()) + recommendation = "ignore"; + while (status>=0 && bootstrap_status_to_string(status, &tag, &summary) < 0) status--; /* find a recognized status string based on current progress */ status = bootstrap_percent; /* set status back to the actual number */

1 0

[tor/master] When hibernating, don't heartbeat about problems.
by nickm＠torproject.org 11 Apr '13

11 Apr '13

commit 34f07ec8629a94b87fd19f93bb62d4f91286fbc6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 20:50:02 2013 -0400 When hibernating, don't heartbeat about problems. Fixes part of 7302. --- changes/bug7302 | 5 +++++ src/or/status.c | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/changes/bug7302 b/changes/bug7302 new file mode 100644 index 0000000..2949e40 --- /dev/null +++ b/changes/bug7302 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Don't log inappropriate heartbeat messages when hibernating: a + hibernating node is _expected_ to drop out of the consensus, + decide it isn't bootstrapped, and so forth. Fixes part of bug + #7302; bugfix on 0.2.3.1-alpha. diff --git a/src/or/status.c b/src/or/status.c index 126167d..6a43fc4 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -14,6 +14,7 @@ #include "router.h" #include "circuitlist.h" #include "main.h" +#include "hibernate.h" /** Return the total number of circuits. */ static int @@ -85,11 +86,12 @@ log_heartbeat(time_t now) char *bw_rcvd = NULL; char *uptime = NULL; const routerinfo_t *me; + const int hibernating = we_are_hibernating(); const or_options_t *options = get_options(); (void)now; - if (public_server_mode(options)) { + if (public_server_mode(options) && !hibernating) { /* Let's check if we are in the current cached consensus. */ if (!(me = router_get_my_routerinfo())) return -1; /* Something stinks, we won't even attempt this. */ @@ -104,10 +106,11 @@ log_heartbeat(time_t now) bw_sent = bytes_to_usage(get_bytes_written()); log_fn(LOG_NOTICE, LD_HEARTBEAT, "Heartbeat: Tor's uptime is %s, with %d " - "circuits open. I've sent %s and received %s.", - uptime, count_circuits(),bw_sent,bw_rcvd); + "circuits open. I've sent %s and received %s.%s", + uptime, count_circuits(),bw_sent,bw_rcvd, + hibernating?" We are currently hibernating.":""); - if (stats_n_data_cells_packaged) + if (stats_n_data_cells_packaged && !hibernating) log_notice(LD_HEARTBEAT, "Average packaged cell fullness: %2.3f%%", 100*(U64_TO_DBL(stats_n_data_bytes_packaged) / U64_TO_DBL(stats_n_data_cells_packaged*RELAY_PAYLOAD_SIZE)) );

1 0

[tor/master] Merge remote-tracking branch 'public/bug7302' into maint-0.2.4
by nickm＠torproject.org 11 Apr '13

11 Apr '13

commit ee3cc44f27b6620ad25a20bb16fcffe23ca66663 Merge: 7f50af1 805ecb8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 11 01:42:54 2013 -0400 Merge remote-tracking branch 'public/bug7302' into maint-0.2.4 Conflicts: src/or/status.c changes/bug7302 | 11 +++++++++++ src/or/control.c | 3 +++ src/or/status.c | 11 +++++++---- 3 files changed, 21 insertions(+), 4 deletions(-) diff --cc src/or/status.c index e44de63,6a43fc4..d239e6e --- a/src/or/status.c +++ b/src/or/status.c @@@ -85,7 -86,7 +86,8 @@@ log_heartbeat(time_t now char *bw_rcvd = NULL; char *uptime = NULL; const routerinfo_t *me; + double r = tls_get_write_overhead_ratio(); + const int hibernating = we_are_hibernating(); const or_options_t *options = get_options(); (void)now;

1 0

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

11 Apr '13

commit 1b026efc6275b3bbaf6f6906d5e0060272e05d15 Merge: 3dfd1eb ee3cc44 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 11 01:43:14 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug7302 | 11 +++++++++++ src/or/control.c | 3 +++ src/or/status.c | 11 +++++++---- 3 files changed, 21 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.2.4] When hibernating, don't heartbeat about problems.
by nickm＠torproject.org 11 Apr '13

11 Apr '13

commit 34f07ec8629a94b87fd19f93bb62d4f91286fbc6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 20:50:02 2013 -0400 When hibernating, don't heartbeat about problems. Fixes part of 7302. --- changes/bug7302 | 5 +++++ src/or/status.c | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/changes/bug7302 b/changes/bug7302 new file mode 100644 index 0000000..2949e40 --- /dev/null +++ b/changes/bug7302 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Don't log inappropriate heartbeat messages when hibernating: a + hibernating node is _expected_ to drop out of the consensus, + decide it isn't bootstrapped, and so forth. Fixes part of bug + #7302; bugfix on 0.2.3.1-alpha. diff --git a/src/or/status.c b/src/or/status.c index 126167d..6a43fc4 100644 --- a/src/or/status.c +++ b/src/or/status.c @@ -14,6 +14,7 @@ #include "router.h" #include "circuitlist.h" #include "main.h" +#include "hibernate.h" /** Return the total number of circuits. */ static int @@ -85,11 +86,12 @@ log_heartbeat(time_t now) char *bw_rcvd = NULL; char *uptime = NULL; const routerinfo_t *me; + const int hibernating = we_are_hibernating(); const or_options_t *options = get_options(); (void)now; - if (public_server_mode(options)) { + if (public_server_mode(options) && !hibernating) { /* Let's check if we are in the current cached consensus. */ if (!(me = router_get_my_routerinfo())) return -1; /* Something stinks, we won't even attempt this. */ @@ -104,10 +106,11 @@ log_heartbeat(time_t now) bw_sent = bytes_to_usage(get_bytes_written()); log_fn(LOG_NOTICE, LD_HEARTBEAT, "Heartbeat: Tor's uptime is %s, with %d " - "circuits open. I've sent %s and received %s.", - uptime, count_circuits(),bw_sent,bw_rcvd); + "circuits open. I've sent %s and received %s.%s", + uptime, count_circuits(),bw_sent,bw_rcvd, + hibernating?" We are currently hibernating.":""); - if (stats_n_data_cells_packaged) + if (stats_n_data_cells_packaged && !hibernating) log_notice(LD_HEARTBEAT, "Average packaged cell fullness: %2.3f%%", 100*(U64_TO_DBL(stats_n_data_bytes_packaged) / U64_TO_DBL(stats_n_data_cells_packaged*RELAY_PAYLOAD_SIZE)) );

1 0

[tor/maint-0.2.4] Make control_event_bootstrap_problem always INFO when hibernating
by nickm＠torproject.org 11 Apr '13

11 Apr '13

commit 805ecb8719e5e66d708f040027fecc6de56b3a5b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 20:52:20 2013 -0400 Make control_event_bootstrap_problem always INFO when hibernating When we're hibernating, the main reqason we can't bootstrap will always be that we're hibernating: reporting anything else at severity WARN is pointless. Fixes part of 7302. --- changes/bug7302 | 8 +++++++- src/or/control.c | 3 +++ 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/changes/bug7302 b/changes/bug7302 index 2949e40..fec615f 100644 --- a/changes/bug7302 +++ b/changes/bug7302 @@ -2,4 +2,10 @@ - Don't log inappropriate heartbeat messages when hibernating: a hibernating node is _expected_ to drop out of the consensus, decide it isn't bootstrapped, and so forth. Fixes part of bug - #7302; bugfix on 0.2.3.1-alpha. + 7302; bugfix on 0.2.3.1-alpha. + + - Don't complain about bootstrapping problems while hibernating. + These complaints reflect a general code problems, but not one + with any problematic effects. (No connections are actually + opened.) Fixes part of bug 7302; bugfix on 0.2.3.2-alpha. + diff --git a/src/or/control.c b/src/or/control.c index 03e5d79..5e61cd7 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4717,6 +4717,9 @@ control_event_bootstrap_problem(const char *warn, int reason) !any_pending_bridge_descriptor_fetches()) recommendation = "warn"; + if (we_are_hibernating()) + recommendation = "ignore"; + while (status>=0 && bootstrap_status_to_string(status, &tag, &summary) < 0) status--; /* find a recognized status string based on current progress */ status = bootstrap_percent; /* set status back to the actual number */

1 0