From df13ae9399d4975aea5ccdf1ac100878acc07e19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= Date: Wed, 3 Jan 2024 19:51:09 +0100 Subject: [PATCH] bencher: update config defaults, use load test max_response_peers --- crates/bencher/src/main.rs | 4 ++-- crates/bencher/src/protocols/udp.rs | 7 ++++--- scripts/bench/setup-udp-bookworm.sh | 1 - 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/crates/bencher/src/main.rs b/crates/bencher/src/main.rs index 1ced040..70cbc44 100644 --- a/crates/bencher/src/main.rs +++ b/crates/bencher/src/main.rs @@ -25,7 +25,7 @@ struct Args { #[arg(long, default_value_t = Priority::Medium)] min_priority: Priority, /// How long to run each load test for - #[arg(long, default_value_t = 60)] + #[arg(long, default_value_t = 90)] duration: usize, /// Only include data for last N seconds of load test runs. /// @@ -33,7 +33,7 @@ struct Args { /// maximum throughput /// /// 0 = use data for whole run - #[arg(long, default_value_t = 0)] + #[arg(long, default_value_t = 30)] summarize_last: usize, #[command(subcommand)] command: Command, diff --git a/crates/bencher/src/protocols/udp.rs b/crates/bencher/src/protocols/udp.rs index b580127..5ea7eaf 100644 --- a/crates/bencher/src/protocols/udp.rs +++ b/crates/bencher/src/protocols/udp.rs @@ -286,7 +286,7 @@ impl ProcessRunner for AquaticUdpRunner { c.socket_workers = self.socket_workers; c.swarm_workers = self.swarm_workers; c.network.address = SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::LOCALHOST, 3000)); - c.protocol.max_response_peers = 50; + c.protocol.max_response_peers = 30; let c = toml::to_string_pretty(&c)?; @@ -391,8 +391,8 @@ impl ProcessRunner for ChihayaUdpRunner { udp: addr: "127.0.0.1:3000" private_key: "abcdefghijklmnopqrst" - max_numwant: 50 - default_numwant: 50 + max_numwant: 30 + default_numwant: 30 storage: name: "memory" "#, @@ -438,6 +438,7 @@ impl ProcessRunner for AquaticUdpLoadTestRunner { c.duration = self.parameters.duration; c.summarize_last = self.parameters.summarize_last; + c.requests.announce_peers_wanted = 30; c.requests.weight_connect = 0; c.requests.weight_announce = 100; c.requests.weight_scrape = 1; diff --git a/scripts/bench/setup-udp-bookworm.sh b/scripts/bench/setup-udp-bookworm.sh index 88ecbee..1e508f2 100755 --- a/scripts/bench/setup-udp-bookworm.sh +++ b/scripts/bench/setup-udp-bookworm.sh @@ -28,7 +28,6 @@ cd .. git clone git://erdgeist.org/opentracker cd opentracker sed -i "s/^OPTS_production=-O3/OPTS_production=-O3 -march=native -mtune=native/g" Makefile -sed -i "s/if \(numwant > 200\) numwant = 200/if (numwant > 50) numwant = 50/g" ot_udp.c make sudo cp ./opentracker /usr/local/bin/ git log --oneline | head -n 1