aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2025-12-18 14:54:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6426 from openanolis/runtime-rs-resize-pty

Browse Source 
bugfix: modify tty_win info in runtime when handling ResizePtyRequest
This commit is contained in:
Chelsea Mafrica
2023-03-10 14:08:41 -08:00
committed by GitHub
parent 99a4eaa898 e7bca62c32
commit 4b877b0a3e
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/runtime-rs/crates/runtimes/virt_container/src/container_manager/container.rs
View File

@@ -344,20 +344,33 @@ impl Container {
height: u32,
) -> Result<()> {
let logger = logger_with_process(process);
let inner = self.inner.read().await;
let mut inner = self.inner.write().await;
if inner.init_process.get_status().await != ProcessStatus::Running {
warn!(logger, "container is not running");
return Ok(());
}
self.agent
.tty_win_resize(agent::TtyWinResizeRequest {
process_id: process.clone().into(),
row: height,
column: width,
})
.await
.context("resize pty")?;
Ok(())
if process.exec_id.is_empty() {
inner.init_process.height = height;
inner.init_process.width = width;
} else if let Some(exec) = inner.exec_processes.get_mut(&process.exec_id) {
exec.process.height = height;
exec.process.width = width;
// for some case, resize_pty request should be handled while the process has not been started in agent
// just return here, and truly resize_pty will happen in start_process
if exec.process.get_status().await != ProcessStatus::Running {
return Ok(());
}
} else {
return Err(anyhow!(
"could not find process {} in container {}",
process.exec_id(),
process.container_id()
));
}
inner.win_resize_process(process, height, width).await
}
pub async fn stats(&self) -> Result<Option<agent::StatsContainerResponse>> {