fix(iroh-net): Magic sock recv_data_ipv4 and recv_data_ipv6 metrics numbers
#2667
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
|
Documentation for this PR has been generated and is available at: https://n0-computer.github.io/iroh/pr/2667/docs/iroh/ Last updated: 2024-08-26T08:29:34Z |
2 tasks
flub
approved these changes
Aug 26, 2024
github-merge-queue bot
pushed a commit
that referenced
this pull request
Aug 26, 2024
…#2668) ## Description <!-- A summary of what this pull request achieves and a rough list of changes. --> Used these changes to test #2667. I think this is a decent tool. Output looks like this: <details> <summary><code>$ cd iroh-net/bench && cargo run --release -- iroh --metrics --with-relay</code></summary> ``` Compiling iroh-net-bench v0.23.0 (/home/philipp/program/work/iroh/iroh-net/bench) Finished `release` profile [optimized + debuginfo] target(s) in 28.47s Running `/home/philipp/program/work/iroh/target/release/bulk iroh --metrics --with-relay` Client 0 stats: Connect time: 1008.829553ms Overall download stats: Transferred 1073741824 bytes on 1 streams in 1.70s (603.46 MiB/s) Time to first byte (TTFB): 105.312ms Total chunks: 36445 Average chunk time: 46.544ms Average chunk size: 28.77KiB Stream download metrics: │ Throughput │ Duration ──────┼───────────────┼────────── AVG │ 603.75 MiB/s │ 1.70s P0 │ 603.50 MiB/s │ 1.70s P10 │ 604.00 MiB/s │ 1.70s P50 │ 604.00 MiB/s │ 1.70s P90 │ 604.00 MiB/s │ 1.70s P100 │ 604.00 MiB/s │ 1.70s Metrics: MagicsockMetrics: { "actor_link_change": 0, "actor_tick_direct_addr_heartbeat": 0, "actor_tick_direct_addr_update_receiver": 6, "actor_tick_main": 22, "actor_tick_msg": 13, "actor_tick_other": 0, "actor_tick_portmap_changed": 0, "actor_tick_re_stun": 2, "num_direct_conns_added": 3, "num_direct_conns_removed": 1, "num_relay_conns_added": 5, "num_relay_conns_removed": 3, "re_stun_calls": 3, "recv_data_ipv4": 88975499264, "recv_data_ipv6": 0, "recv_data_relay": 49200, "recv_datagrams": 944499, "recv_disco_bad_key": 0, "recv_disco_bad_parse": 0, "recv_disco_call_me_maybe": 2, "recv_disco_call_me_maybe_bad_disco": 0, "recv_disco_ping": 14, "recv_disco_pong": 14, "recv_disco_relay": 6, "recv_disco_udp": 24, "relay_home_change": 2, "send_data": 1104903421, "send_data_network_down": 0, "send_disco_relay": 6, "send_disco_udp": 24, "send_ipv4": 1104905771, "send_ipv6": 470, "send_relay": 49988, "send_relay_error": 0, "sent_disco_call_me_maybe": 2, "sent_disco_ping": 14, "sent_disco_pong": 14, "sent_disco_relay": 6, "sent_disco_udp": 24, "update_direct_addrs": 3, } NetcheckMetrics: { "reports": 3, "reports_full": 0, "stun_packets_dropped": 0, "stun_packets_recv_ipv4": 0, "stun_packets_recv_ipv6": 0, "stun_packets_sent_ipv4": 10, "stun_packets_sent_ipv6": 10, } PortmapMetrics: { "external_address_updated": 0, "local_port_updates": 3, "mapping_attempts": 5, "mapping_failures": 3, "pcp_available": 0, "pcp_probes": 3, "probes_started": 3, "upnp_available": 0, "upnp_gateway_updated": 0, "upnp_probes": 6, "upnp_probes_failed": 3, } RelayMetrics: { "accepts": 2, "bytes_recv": 50082, "bytes_sent": 50082, "derp_accepts": 2, "disco_packets_dropped": 0, "disco_packets_recv": 0, "disco_packets_sent": 0, "disconnects": 0, "got_ping": 0, "other_packets_dropped": 0, "other_packets_recv": 2, "other_packets_sent": 0, "send_packets_dropped": 0, "send_packets_recv": 9, "send_packets_sent": 9, "sent_pong": 0, "unique_client_keys": 2, "unknown_frames": 0, "websocket_accepts": 0, } ``` </details> ## Breaking Changes <!-- Optional, if there are any breaking changes document them, including how to migrate older code. --> None. The semver check also checks for the "public API" of `iroh-net/bench`, and there's been another `Opt` addition. ## Notes & open questions <!-- Any notes, remarks or open questions you have to make about the PR. --> This PR is based on #2664 at the moment, let's merge that first. ## Change checklist - [x] Self-review. - ~~[ ] Documentation updates following the [style guide](https://rust-lang.github.io/rfcs/1574-more-api-documentation-conventions.html#appendix-a-full-conventions-text), if relevant.~~ - ~~[ ] Tests if relevant.~~ - [x] All breaking changes documented.
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.
Description
Previously, when I edited the iroh-net benchmark to print metrics, it'd show (on a 1GB transfer):
Clearly, the 89GB received data is wrong. The reason is that we record the buffer size when we record metrics instead of recording the received packet size.
The buffer tends to be around ~90kB for me, while the received packets are around 1-2kB. This explains the 90x factor.
With this fix, I now get:
Breaking Changes
None.
Notes & open questions
Change checklist
[ ] Documentation updates following the style guide, if relevant.[ ] Tests if relevant.