From 3bd7dc504eb92445cbd54da8a0ec65bb047c6903 Mon Sep 17 00:00:00 2001 From: Jamil Date: Thu, 22 Feb 2024 11:57:22 -0800 Subject: [PATCH] fix(ci): Fix flaky iperf3 "Bad file descriptor" (#3731) - Lower UDP bandwidth to 50M -- this fixes intermittent file descriptor issues because we overload iperf3 for more than 5 seconds - Simplify iperf3 to the minimum set that makes tests reliable --- scripts/tests/perf/direct-tcp-client2server.sh | 2 -- scripts/tests/perf/direct-tcp-server2client.sh | 2 -- scripts/tests/perf/direct-udp-client2server.sh | 3 +-- scripts/tests/perf/direct-udp-server2client.sh | 3 +-- scripts/tests/perf/relayed-tcp-client2server.sh | 2 -- scripts/tests/perf/relayed-tcp-server2client.sh | 2 -- scripts/tests/perf/relayed-udp-client2server.sh | 3 +-- scripts/tests/perf/relayed-udp-server2client.sh | 3 +-- 8 files changed, 4 insertions(+), 16 deletions(-) diff --git a/scripts/tests/perf/direct-tcp-client2server.sh b/scripts/tests/perf/direct-tcp-client2server.sh index ef295ce4c..56bffbe02 100755 --- a/scripts/tests/perf/direct-tcp-client2server.sh +++ b/scripts/tests/perf/direct-tcp-client2server.sh @@ -3,7 +3,5 @@ set -euox pipefail docker compose exec --env RUST_LOG=info -it client /bin/sh -c 'iperf3 \ - --set-mss 1240 \ - --zerocopy \ --client 172.20.0.110 \ --json' >>"${TEST_NAME}.json" diff --git a/scripts/tests/perf/direct-tcp-server2client.sh b/scripts/tests/perf/direct-tcp-server2client.sh index e3eed77b4..f97bf281e 100755 --- a/scripts/tests/perf/direct-tcp-server2client.sh +++ b/scripts/tests/perf/direct-tcp-server2client.sh @@ -4,7 +4,5 @@ set -euox pipefail docker compose exec --env RUST_LOG=info -it client /bin/sh -c 'iperf3 \ --reverse \ - --set-mss 1240 \ - --zerocopy \ --client 172.20.0.110 \ --json' >>"${TEST_NAME}.json" diff --git a/scripts/tests/perf/direct-udp-client2server.sh b/scripts/tests/perf/direct-udp-client2server.sh index a3c327275..6eae37169 100755 --- a/scripts/tests/perf/direct-udp-client2server.sh +++ b/scripts/tests/perf/direct-udp-client2server.sh @@ -3,8 +3,7 @@ set -euox pipefail docker compose exec --env RUST_LOG=info -it client /bin/sh -c 'iperf3 \ - --zerocopy \ --udp \ - --bandwidth 1G \ + --bandwidth 50M \ --client 172.20.0.110 \ --json' >>"${TEST_NAME}.json" diff --git a/scripts/tests/perf/direct-udp-server2client.sh b/scripts/tests/perf/direct-udp-server2client.sh index 6f92b8d98..113525869 100755 --- a/scripts/tests/perf/direct-udp-server2client.sh +++ b/scripts/tests/perf/direct-udp-server2client.sh @@ -4,8 +4,7 @@ set -euox pipefail docker compose exec --env RUST_LOG=info -it client /bin/sh -c 'iperf3 \ --reverse \ - --zerocopy \ --udp \ - --bandwidth 1G \ + --bandwidth 50M \ --client 172.20.0.110 \ --json' >>"${TEST_NAME}.json" diff --git a/scripts/tests/perf/relayed-tcp-client2server.sh b/scripts/tests/perf/relayed-tcp-client2server.sh index 80a9e5961..586147571 100755 --- a/scripts/tests/perf/relayed-tcp-client2server.sh +++ b/scripts/tests/perf/relayed-tcp-client2server.sh @@ -6,7 +6,5 @@ source "./scripts/tests/lib.sh" install_iptables_drop_rules docker compose exec --env RUST_LOG=info -it client /bin/sh -c 'iperf3 \ - --set-mss 1240 \ - --zerocopy \ --client 172.20.0.110 \ --json' >>"${TEST_NAME}.json" diff --git a/scripts/tests/perf/relayed-tcp-server2client.sh b/scripts/tests/perf/relayed-tcp-server2client.sh index 5c8889bca..4ad754840 100755 --- a/scripts/tests/perf/relayed-tcp-server2client.sh +++ b/scripts/tests/perf/relayed-tcp-server2client.sh @@ -7,7 +7,5 @@ install_iptables_drop_rules docker compose exec --env RUST_LOG=info -it client /bin/sh -c 'iperf3 \ --reverse \ - --set-mss 1240 \ - --zerocopy \ --client 172.20.0.110 \ --json' >>"${TEST_NAME}.json" diff --git a/scripts/tests/perf/relayed-udp-client2server.sh b/scripts/tests/perf/relayed-udp-client2server.sh index d6b962862..acb64efbe 100755 --- a/scripts/tests/perf/relayed-udp-client2server.sh +++ b/scripts/tests/perf/relayed-udp-client2server.sh @@ -6,8 +6,7 @@ source "./scripts/tests/lib.sh" install_iptables_drop_rules docker compose exec --env RUST_LOG=info -it client /bin/sh -c 'iperf3 \ - --zerocopy \ --udp \ - --bandwidth 1G \ + --bandwidth 50M \ --client 172.20.0.110 \ --json' >>"${TEST_NAME}.json" diff --git a/scripts/tests/perf/relayed-udp-server2client.sh b/scripts/tests/perf/relayed-udp-server2client.sh index 91d6bb667..7a5c16368 100755 --- a/scripts/tests/perf/relayed-udp-server2client.sh +++ b/scripts/tests/perf/relayed-udp-server2client.sh @@ -7,8 +7,7 @@ install_iptables_drop_rules docker compose exec --env RUST_LOG=info -it client /bin/sh -c 'iperf3 \ --reverse \ - --zerocopy \ --udp \ - --bandwidth 1G \ + --bandwidth 50M \ --client 172.20.0.110 \ --json' >>"${TEST_NAME}.json"