Fix case were agent log message causes startup failure

changelog.d/+log-message-causes-failure.fixed.md

@@ -0,0 +1 @@
+Fix case were agent log message causes startup failure

mirrord/agent/src/main.rs

@@ -243,9 +243,9 @@ impl ClientConnectionHandler {
 
         let file_manager = FileManager::new(pid.or_else(|| state.ephemeral.then_some(1)));
 
-        let tcp_sniffer_api = Self::ceate_sniffer_api(id, bg_tasks.sniffer, &mut connection).await;
+        let tcp_sniffer_api = Self::create_sniffer_api(id, bg_tasks.sniffer, &mut connection).await;
         let tcp_stealer_api =
-            Self::ceate_stealer_api(id, bg_tasks.stealer, protocol_version, &mut connection)
+            Self::create_stealer_api(id, bg_tasks.stealer, protocol_version, &mut connection)
                 .await?;
         let dns_api = Self::create_dns_api(bg_tasks.dns);
 
@@ -267,7 +267,7 @@ impl ClientConnectionHandler {
         Ok(client_handler)
     }
 
-    async fn ceate_sniffer_api(
+    async fn create_sniffer_api(
         id: ClientId,
         task: BackgroundTask<SnifferCommand>,
         connection: &mut ClientConnection,
@@ -295,7 +295,7 @@ impl ClientConnectionHandler {
         }
     }
 
-    async fn ceate_stealer_api(
+    async fn create_stealer_api(
         id: ClientId,
         task: BackgroundTask<StealerCommand>,
         protocol_version: semver::Version,

mirrord/cli/src/internal_proxy.rs

@@ -17,13 +17,14 @@ use std::{
     time::Duration,
 };
 
+use clap::error;
 use mirrord_analytics::{AnalyticsError, AnalyticsReporter, CollectAnalytics, Reporter};
 use mirrord_config::LayerConfig;
 use mirrord_intproxy::{
     agent_conn::{AgentConnectInfo, AgentConnection},
     IntProxy,
 };
-use mirrord_protocol::{pause::DaemonPauseTarget, ClientMessage, DaemonMessage};
+use mirrord_protocol::{pause::DaemonPauseTarget, ClientMessage, DaemonMessage, LogLevel};
 use nix::{
     libc,
     sys::resource::{setrlimit, Resource},
@@ -254,10 +255,20 @@ async fn ping(
     receiver: &mut mpsc::Receiver<DaemonMessage>,
 ) -> Result<(), InternalProxySetupError> {
     sender.send(ClientMessage::Ping).await?;
-    match receiver.recv().await {
-        Some(DaemonMessage::Pong) => Ok(()),
-        _ => Err(InternalProxySetupError::AgentClosedConnection),
+    loop {
+        match tokio::time::timeout(Duration::from_secs(5), receiver.recv()).await {
+            Ok(Some(DaemonMessage::Pong)) => break,
+            Ok(Some(DaemonMessage::LogMessage(msg))) => match msg.level {
+                LogLevel::Error => error!("Agent log: {}", msg.message),
+                LogLevel::Warn => warn!("Agent log: {}", msg.message),
+            },
+            other => {
+                error!(?other, "Invalid ping response");
+                return Err(InternalProxySetupError::AgentClosedConnection);
+            }
+        }
     }
+    Ok(())
 }
 
 fn create_ping_loop(