From fb2c142f183f908ca9aa06aee669186ff7286e01 Mon Sep 17 00:00:00 2001
From: Bin Liu <bin@hyper.sh>
Date: Fri, 2 Dec 2022 14:52:34 +0800
Subject: [PATCH] runtime-rs: fix some variable names and typos

Fix some not perfect variable names, and some typos in logs.

Fixes: #5820

Signed-off-by: Bin Liu <bin@hyper.sh>
---
 src/runtime-rs/crates/runtimes/src/manager.rs        | 12 ++++++++----
 .../src/container_manager/container.rs               |  4 ++--
 .../virt_container/src/container_manager/manager.rs  |  2 +-
 src/runtime-rs/crates/service/src/manager.rs         |  2 +-
 src/runtime-rs/crates/service/src/task_service.rs    |  2 +-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/runtime-rs/crates/runtimes/src/manager.rs b/src/runtime-rs/crates/runtimes/src/manager.rs
index c6471fa584..df26c28437 100644
--- a/src/runtime-rs/crates/runtimes/src/manager.rs
+++ b/src/runtime-rs/crates/runtimes/src/manager.rs
@@ -200,12 +200,16 @@ impl RuntimeHandlerManager {
     }
 
     pub async fn handler_message(&self, req: Request) -> Result<Response> {
-        if let Request::CreateContainer(req) = req {
+        if let Request::CreateContainer(container_config) = req {
             // get oci spec
-            let bundler_path = format!("{}/{}", req.bundle, oci::OCI_SPEC_CONFIG_FILE_NAME);
+            let bundler_path = format!(
+                "{}/{}",
+                container_config.bundle,
+                oci::OCI_SPEC_CONFIG_FILE_NAME
+            );
             let spec = oci::Spec::load(&bundler_path).context("load spec")?;
 
-            self.try_init_runtime_instance(&spec, &req.options)
+            self.try_init_runtime_instance(&spec, &container_config.options)
                 .await
                 .context("try init runtime instance")?;
             let instance = self
@@ -215,7 +219,7 @@ impl RuntimeHandlerManager {
 
             let shim_pid = instance
                 .container_manager
-                .create_container(req, spec)
+                .create_container(container_config, spec)
                 .await
                 .context("create container")?;
 
diff --git a/src/runtime-rs/crates/runtimes/virt_container/src/container_manager/container.rs b/src/runtime-rs/crates/runtimes/virt_container/src/container_manager/container.rs
index 2e2a025f07..3aac5864f8 100644
--- a/src/runtime-rs/crates/runtimes/virt_container/src/container_manager/container.rs
+++ b/src/runtime-rs/crates/runtimes/virt_container/src/container_manager/container.rs
@@ -93,8 +93,8 @@ impl Container {
 
         // update rootfs
         match spec.root.as_mut() {
-            Some(spec) => {
-                spec.path = rootfs
+            Some(root) => {
+                root.path = rootfs
                     .get_guest_rootfs_path()
                     .await
                     .context("get guest rootfs path")?
diff --git a/src/runtime-rs/crates/runtimes/virt_container/src/container_manager/manager.rs b/src/runtime-rs/crates/runtimes/virt_container/src/container_manager/manager.rs
index b4b20bbf36..1358db5b2d 100644
--- a/src/runtime-rs/crates/runtimes/virt_container/src/container_manager/manager.rs
+++ b/src/runtime-rs/crates/runtimes/virt_container/src/container_manager/manager.rs
@@ -253,7 +253,7 @@ impl ContainerManager for VirtContainerManager {
         let c = containers
             .get(container_id)
             .ok_or_else(|| Error::ContainerNotFound(container_id.to_string()))?;
-        c.update(&resource).await.context("stats")
+        c.update(&resource).await.context("update_container")
     }
 
     async fn pid(&self) -> Result<PID> {
diff --git a/src/runtime-rs/crates/service/src/manager.rs b/src/runtime-rs/crates/service/src/manager.rs
index 1019aa220a..3088a88916 100644
--- a/src/runtime-rs/crates/service/src/manager.rs
+++ b/src/runtime-rs/crates/service/src/manager.rs
@@ -65,7 +65,7 @@ async fn send_event(
             &namespace,
         ])
         .spawn()
-        .context("sawn cmd")?;
+        .context("spawn containerd cmd to publish event")?;
 
     let stdin = child.stdin.as_mut().context("failed to open stdin")?;
     stdin
diff --git a/src/runtime-rs/crates/service/src/task_service.rs b/src/runtime-rs/crates/service/src/task_service.rs
index 3a98a083e9..a612796c71 100644
--- a/src/runtime-rs/crates/service/src/task_service.rs
+++ b/src/runtime-rs/crates/service/src/task_service.rs
@@ -40,7 +40,7 @@ where
     let r = req
         .try_into()
         .map_err(|err| ttrpc::Error::Others(format!("failed to translate from shim {:?}", err)))?;
-    let logger = sl!().new(o!("steam id" =>  ctx.mh.stream_id));
+    let logger = sl!().new(o!("stream id" =>  ctx.mh.stream_id));
     debug!(logger, "====> task service {:?}", &r);
     let resp = s
         .handler_message(r)