While start the shim fail, ensure the socket file has been remove

Discovered socket file leak when set_cgroup_ond_oom_store execution failed

Signed-off-by: jokemanfire <[email protected]>

Author: jokemanfire

crates/shim-protos/examples/ttrpc-server-async.rs

@@ -60,7 +60,7 @@ impl Task for FakeServer {
 async fn main() {
     simple_logger::SimpleLogger::new().init().unwrap();
 
-    let tservice = create_task(Arc::new(Box::new(FakeServer::new())));
+    let tservice = create_task(Arc::new(FakeServer::new()));
 
     let mut server = Server::new()
         .bind("unix:///tmp/shim-proto-ttrpc-001")

crates/shim-protos/examples/ttrpc-server.rs

@@ -56,8 +56,7 @@ impl Task for FakeServer {
 
 fn main() {
     simple_logger::SimpleLogger::new().init().unwrap();
-
-    let tservice = create_task(Arc::new(Box::new(FakeServer::new())));
+    let tservice = create_task(Arc::new(FakeServer::new()));
 
     let mut server = Server::new()
         .bind("unix:///tmp/shim-proto-ttrpc-001")

crates/shim-protos/tests/ttrpc.rs

@@ -72,7 +72,7 @@ fn create_ttrpc_context() -> (
 
 #[test]
 fn test_task_method_num() {
-    let task = create_task(Arc::new(Box::new(FakeServer::new())));
+    let task = create_task(Arc::new(FakeServer::new()));
     assert_eq!(task.len(), 17);
 }
 
@@ -96,7 +96,7 @@ fn test_create_task() {
     request.set_timeout_nano(10000);
     request.set_metadata(ttrpc::context::to_pb(ctx.metadata.clone()));
 
-    let task = create_task(Arc::new(Box::new(FakeServer::new())));
+    let task = create_task(Arc::new(FakeServer::new()));
     let create = task.get("/containerd.task.v2.Task/Create").unwrap();
     create.handler(ctx, request).unwrap();
 
@@ -137,7 +137,7 @@ fn test_delete_task() {
     request.set_timeout_nano(10000);
     request.set_metadata(ttrpc::context::to_pb(ctx.metadata.clone()));
 
-    let task = create_task(Arc::new(Box::new(FakeServer::new())));
+    let task = create_task(Arc::new(FakeServer::new()));
     let delete = task.get("/containerd.task.v2.Task/Delete").unwrap();
     delete.handler(ctx, request).unwrap();
 

crates/shim/src/asynchronous/mod.rs

@@ -344,11 +344,21 @@ pub async fn spawn(opts: StartOpts, grouping: &str, vars: Vec<(&str, &str)>) ->
         command.arg("-debug");
     }
     command.envs(vars);
-
-    let _child = command.spawn().map_err(io_error!(e, "spawn shim"))?;
+    // if fail we should remove socket
+    let result = command.spawn().map_err(io_error!(e, "spawn shim"));
+    if result.is_err() {
+        remove_socket(&address).await?;
+    }
+    let _child = result?;
+    // if fail we should remove socket
     #[cfg(target_os = "linux")]
-    crate::cgroup::set_cgroup_and_oom_score(_child.id())?;
-    Ok(address)
+    match crate::cgroup::set_cgroup_and_oom_score(_child.id()) {
+        Ok(_) => Ok(address),
+        Err(error) => {
+            remove_socket(&address).await?;
+            Err(error)
+        }
+    }
 }
 
 #[cfg_attr(feature = "tracing", tracing::instrument(skip_all, level = "info"))]

crates/shim/src/asynchronous/publisher.rs

@@ -218,7 +218,7 @@ mod tests {
         let barrier2 = barrier.clone();
         let server_thread = tokio::spawn(async move {
             let listener = UnixListener::bind(&path1).unwrap();
-            let service = create_events(Arc::new(Box::new(server)));
+            let service = create_events(Arc::new(server));
             let mut server = Server::new()
                 .set_domain_unix()
                 .add_listener(listener.as_raw_fd())