[network/test] Add logs and timeout to iPerf test

Add some logs indicating when an iPerf client or server starts or stops,
as well as a 60-second timeout to the logic waiting for a component
stopped event. Test flakes have looked like the component stopped event
may never be arriving for one or more components.

Bug: 404377171
Change-Id: Ibc9158b12ad07bc69da78143ed7ffede7ca0f7c1
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1231426
Fuchsia-Auto-Submit: Peter Johnston <[email protected]>
Reviewed-by: Evan Wildenhain <[email protected]>
Commit-Queue: Auto-Submit <[email protected]>

Author: peterthejohnston

src/connectivity/network/tests/benchmarks/iperf-hermetic/BUILD.gn

@@ -26,15 +26,16 @@ rustc_binary("bin") {
     "//src/connectivity/network/tests/integration/common:netstack_testing_common",
     "//src/lib/fidl/rust/fidl",
     "//src/lib/fuchsia",
+    "//src/lib/fuchsia-async",
     "//src/sys/lib/component-events",
     "//third_party/rust_crates:anyhow",
     "//third_party/rust_crates:argh",
     "//third_party/rust_crates:futures",
+    "//third_party/rust_crates:log",
   ]
   test_deps = [
     "//src/connectivity/network/tests/integration/macros:netstack_testing_macros",
     "//src/lib/diagnostics/reader/rust",
-    "//third_party/rust_crates:log",
     "//third_party/rust_crates:test-case",
   ]
   configs -= [ "//build/config/rust/lints:allow_unused_results" ]

src/connectivity/network/tests/benchmarks/iperf-hermetic/src/main.rs

@@ -6,6 +6,7 @@ use std::fmt::Display;
 
 use fidl::endpoints::ProtocolMarker as _;
 use fidl_fuchsia_netemul as fnetemul;
+use fuchsia_async::TimeoutExt as _;
 use futures::FutureExt as _;
 use net_types::ip::Ipv4;
 use netstack_testing_common::realms::{
@@ -84,6 +85,9 @@ async fn watch_for_exit(
     component_moniker: &str,
 ) -> component_events::events::ExitStatus {
     let event = wait_for_component_stopped(&realm, component_moniker, None)
+        .on_timeout(std::time::Duration::from_secs(60), || {
+            panic!("timed out waiting for component stopped event: {component_moniker}");
+        })
         .await
         .expect("observe stopped event");
     let component_events::events::StoppedPayload { status, .. } =
@@ -247,10 +251,14 @@ async fn bench<N: Netstack, I: TestIpExt>(
     let mut clients = futures::future::join_all((0..flows).map(|i| async move {
         loop {
             realm_ref.start_child_component(&client_moniker(i)).await.expect("start client");
-            if watch_for_exit(realm_ref, &client_moniker(i)).await
-                == component_events::events::ExitStatus::Clean
-            {
+            log::info!("started client {i}");
+
+            let status = watch_for_exit(realm_ref, &client_moniker(i)).await;
+            if status == component_events::events::ExitStatus::Clean {
+                log::info!("client {i} exited cleanly");
                 return;
+            } else {
+                log::info!("client {i} crashed: {status:?}; retrying");
             }
         }
     }))