Move relay connection logic into main event loop #632
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sandreae
force-pushed
the
relay-connection-in-main-event-loop
branch
from
a2ea5c1
to
a860fcf
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## bump-libp2p #632 +/- ##
===============================================
+ Coverage 92.35% 92.46% +0.11%
===============================================
Files 106 104 -2
Lines 17861 20474 +2613
===============================================
+ Hits 16495 18931 +2436
- Misses 1366 1543 +177 ☔ View full report in Codecov by Sentry. |
|
(needs a rebase against |
sandreae
force-pushed
the
relay-connection-in-main-event-loop
branch
from
98848dc
to
3b95ae9
Compare
jmanm
added a commit
to jmanm/aquadoggo
that referenced
this pull request
Jul 13, 2024
* Make clippy happy * Revert "Make clippy happy" This reverts commit e250ccd. * Try fmt and clippy again * Add clippy suggestions * Allow setting path to config file via env args (p2panda#611) * Enable passing path to config file via env args * Remove println * Update comment * Remove unwanted file * Update CHANGELOG * Accept domain name and ip addresses for peers (p2panda#612) * Accept String for relay and direct peer addresses in config * Use ToSocketAddress to handle ip and domain name addresses * Clippy * fmt * Update CHANGELOG * Update example config.toml * Prepare CHANGELOG for release * 0.7.2 * Fix: query for child relations fails when relation list empty (p2panda#614) * Add test get_child_document_ids test case for document with empty relation list * Account for null values when relation lists are empty * Update test comment * Update CHANGELOG * 0.7.3 * Re-run tasks for partially materialized blobs (p2panda#618) * Check materialized blob file is complete before aborting task * Add test * fmt * Update CHANGELOG * Clippy * Correct cmp logic * Remove double comment --------- Co-authored-by: adz <x12@adz.garden> * Fix: include all logs from target schema id during replication (p2panda#620) * Include tombstoned documents when calculating local log heights * Clippy * Update CHANGELOG * Make clippy happy * Bump rust gh action to v1 and define toolchain version * Introduce `PeerAddress` struct for improved address resolution patterns (p2panda#621) * Introduce PeerAddress struct with socket and multiaddr resolution methods * Don't pop of p2p protocol from relay address as it isn't there * fmt * Update CHANGELOG * Cache socket addresses * Remove Multiaddr from PeerAddress * Remove serde traits from PeerAddress * Add doc string to PeerAddress * Rename methods * Re-apply unhandled operations during startup of materializer service (p2panda#623) * Store method to get all un-indexed operation ids * Pick up un-indexed operations when starting materializer service, add a test * Add entry to CHANGELOG.md * Increase `max_pending_connections_*` (p2panda#628) * Increase max pending connections * Update CHANGELOG * Dial all configured known relay and direct node addresses on schedule (p2panda#622) * Poll all known peer addresses * Update PeerAddress method name * Update CHANGELOG * WIP: poll known peers * Check if a direct node was identified (and add comments) * Don't dial direct node address on startup, rely on scheduler * More comments * Remove unused import * fmt * Doc strings for EventLoop struct * Clippy * 0.7.4 * Minor CHANGELOG.md formatting change * Fix: handle connection ids greater than 9 in `Peer` impl of `Human` trait (p2panda#634) * Handle connection ids greater than 9 in peer Human impl * Clippy * Update CHANGELOG * Bump `libp2p` to version `0.53.2` (p2panda#631) * Bump libp2p to version 0.53.2 * We don't need to listen on tcp port when in relay mode * Listening on relay circuit no longer sometimes fails * Remove tcp feature requirement from libp2p * Refactor connection_keep_alive method * Clippy * Remove unnecessary connection_keep_alive method from peers behaviour * Add CHANGELOG.md entry --------- Co-authored-by: adz <x12@adz.garden> * Move relay connection logic into main event loop (p2panda#632) * Bump `libp2p` to version `0.53.2` (p2panda#631) * Bump libp2p to version 0.53.2 * We don't need to listen on tcp port when in relay mode * Listening on relay circuit no longer sometimes fails * Remove tcp feature requirement from libp2p * Refactor connection_keep_alive method * Clippy * Remove unnecessary connection_keep_alive method from peers behaviour * Add CHANGELOG.md entry --------- Co-authored-by: adz <x12@adz.garden> * Move network service relay initialization into main event loop * Clippy * Add DCUTR event debug logging to swarm * Change log message * Adjust connection limits * Even nicer log messages * Helper to print or info log depending on log level * Listening on relay circuit no longer sometimes fails --------- Co-authored-by: adz <x12@adz.garden> * Support private net with pre-shared key (p2panda#635) * Swarm listens on both TCP and QUIC addresses * Support both QUIC and TCP protocols * TCP port_reuse should be false * Establish a private net over TCP when psk provided in NetworkConfig * Initiate swarm with private net when psk provided in config * Update CHANGELOG * Doc string fix * Don't need to differentiate between transports when detecting port * Update README * Fix README formatting * Update example config file * Check if blob file exists before deleting it from fs (p2panda#636) * Check if blob file exists before deleting it from fs * Add entry to CHANGELOG.md * Inconsistent blob storage warning was wrongly shown (p2panda#638) * Inconsistent blob storage warning was wrongly shown * Add entry to CHANGELOG.md * Minor config.toml cleanup * Safely handle missing document when retrieving document view from store (p2panda#637) * Return None when document was deleted * Add entry to CHANGELOG.md * Introduce API to subscribe to peer connection events (p2panda#625) * Introduce API to subscribe to peer connection events * Add entry to CHANGELOG.md * 0.8.0 * Also bump version in aquadoggo_cli, add note about that in RELEASE.md * Adjust level of replication session and document materialization logs (p2panda#639) * Remove relay and direct peer poll attempt logging * Change document creation/update/delete logging to info level * Lower level of replication session logs to debug * Update CHANGELOG * Remove incorrectly commit file * Lower logging level for replication finished message * Fix logging logic error in reducer * Improve GraphQL re-build error * Update README.md * Expose NodeEvent to public API (p2panda#643) * Expose NodeEvent to public API * Add entry to CHANGELOG.md --------- Co-authored-by: adz <x12@adz.garden> Co-authored-by: Sam Andreae <contact@samandreae.com> Co-authored-by: adz <adzialocha@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Before this PR a peer only registered on any configured relay nodes on startup in an initiation phase before the main networking event loop started. The main reason for this is that listening on the circuit relay would sometimes (quite often) fail and so we needed a retry loop which would timeout after x seconds. This pattern was clunky and not possible to fit into the event loop. It also meant that we had to disable the
Peersbehaviour, enable it, and then force connect again to the relay in order to trigger replication... ugh...Since #631 listening on the circuit relay never seems to fail, and so moving all of the relay connection and registration logic into the main event loop is now possible (yay!). This unlocks some nicer patterns around handling relays and means we can dynamically register on relays during runtime. No disabling peers behaviour and secondary force connecting required.
Relaystruct for holding current state relating to relays and a node's registration on itprintln!(..)orinfo!(..)startup infocheck out these beautiful logs!!
📋 Checklist
Add tests that cover your changesCHANGELOG.md