diff options
| author | David Goulet <dgoulet@torproject.org> | 2021-10-08 10:43:53 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2021-10-08 10:43:53 -0400 |
| commit | ba5a71b91325b52f27fff76b736af9ddd16ba540 (patch) | |
| tree | 986dc109ffaeb1e2accd757d90e807ab7fcae398 | |
| parent | fd5e9f4041f2f648fd9c94ce8b742e5c54644323 (diff) | |
| parent | 4046b9f3ee996258e2335c64e7b914df7185ffc9 (diff) | |
| download | tor-ba5a71b91325b52f27fff76b736af9ddd16ba540.tar.gz tor-ba5a71b91325b52f27fff76b736af9ddd16ba540.zip | |
Merge branch 'tor-gitlab/mr/447'
| -rw-r--r-- | changes/ticket34083 | 5 | ||||
| -rw-r--r-- | src/core/or/connection_edge.c | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/changes/ticket34083 b/changes/ticket34083 new file mode 100644 index 0000000000..417d01c5a5 --- /dev/null +++ b/changes/ticket34083 @@ -0,0 +1,5 @@ + o Minor bugfixes (onion service): + - Fix a warning BUG that would occur often on heavily loaded onion service + leading to filling the logs with useless warnings. Fixes bug 34083; bugfix + on 0.3.2.1-alpha. + diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index f3c1ca3dab..7127cbb94b 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -1347,11 +1347,10 @@ connection_ap_attach_pending(int retry) continue; } if (conn->state != AP_CONN_STATE_CIRCUIT_WAIT) { - log_warn(LD_BUG, "%p is no longer in circuit_wait. Its current state " - "is %s. Why is it on pending_entry_connections?", - entry_conn, - conn_state_to_string(conn->type, conn->state)); - UNMARK(); + /* The connection_ap_handshake_attach_circuit() call, for onion service, + * can lead to more than one connections in the "pending" list to change + * state and so it is OK to get here. Ignore it because this connection + * won't be in pending_entry_connections list after this point. */ continue; } |