From 4ab1cf4066d9aaefdc501b7fd27350f773ae5253 Mon Sep 17 00:00:00 2001 From: Kevin Krakauer Date: Tue, 9 May 2023 14:56:50 -0700 Subject: [PATCH] tcp_benchmark: make compatible with iperf3 iperf3 outputs a different error message when failing to connect. We need to recognize it to know to retry. PiperOrigin-RevId: 530721657 --- test/benchmarks/tcp/tcp_benchmark.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/benchmarks/tcp/tcp_benchmark.sh b/test/benchmarks/tcp/tcp_benchmark.sh index 60cfa2d58..8d0ab72f8 100755 --- a/test/benchmarks/tcp/tcp_benchmark.sh +++ b/test/benchmarks/tcp/tcp_benchmark.sh @@ -414,7 +414,7 @@ trap cleanup EXIT while ${nsjoin_binary} /tmp/client.netns iperf \\ ${iperf_version_arg} -p ${proxy_port} -c ${client_addr} -t ${duration} -f m -P ${num_client_threads} 2>&1 \\ | tee \$results_file \\ - | grep "connect failed" >/dev/null; do + | grep -E "connect failed|unable to connect" >/dev/null; do sleep 0.1 # Wait for all services. done