github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-10 20:32:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10058 from Apokleos/enhance-vsock-connect

Browse Source 
runtime-rs: enhance debug info for agent connect.
This commit is contained in:
Alex Lyn 2024-07-25 11:29:04 +08:00 committed by GitHub
commit 4e003a2125
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/runtime-rs/crates/agent/src/kata/mod.rs
View File

@ -113,7 +113,13 @@ impl KataAgent {
sock::new(&inner.socket_address, inner.config.server_port).context("new sock")?; sock::new(&inner.socket_address, inner.config.server_port).context("new sock")?;
let stream = sock.connect(&config).await.context("connect")?; let stream = sock.connect(&config).await.context("connect")?;
let fd = stream.into_raw_fd(); let fd = stream.into_raw_fd();
info!(sl!(), "get stream raw fd {:?}", fd); info!(
sl!(),
"get stream raw fd {:?} with socket address: {:?} and server_port {:?}",
fd,
&inner.socket_address,
inner.config.server_port
);
let c = Client::new(fd); let c = Client::new(fd);
inner.client = Some(c); inner.client = Some(c);
inner.client_fd = fd; inner.client_fd = fd;

8
src/runtime-rs/crates/agent/src/sock/vsock.rs
View File

@ -69,11 +69,15 @@ impl Sock for Vsock {
); );
return Ok(Stream::Vsock(stream)); return Ok(Stream::Vsock(stream));
} }
Err(_) => { Err(e) => {
debug!(sl!(), "retry after {} ms: failed to connect to agent via vsock at {} attempts: {:?}", config.dial_timeout_ms, i, e);
tokio::time::sleep(Duration::from_millis(config.dial_timeout_ms)).await; tokio::time::sleep(Duration::from_millis(config.dial_timeout_ms)).await;
} }
} }
} }
Err(anyhow!("cannot connect to agent ttrpc server {:?}", config)) Err(anyhow!(
"cannot connect vsock to agent ttrpc server {:?}",
config
))
} }
} }

5
src/runtime-rs/crates/runtimes/virt_container/src/sandbox.rs
View File

@ -382,7 +382,10 @@ impl Sandbox for VirtSandbox {
.get_agent_socket() .get_agent_socket()
.await .await
.context("get agent socket")?; .context("get agent socket")?;
self.agent.start(&address).await.context("connect")?; self.agent
.start(&address)
.await
.context(format!("connect to address {:?}", &address))?;
self.resource_manager self.resource_manager
.setup_after_start_vm() .setup_after_start_vm()