Merge pull request #23 from radu-matei/fix/shutdown

fix(shutdown): handle termination for container
spinkube · Mar 6, 2024 · de3d5bc · de3d5bc
2 parents b6c0ac0 + 77b383b
commit de3d5bc
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/containerd-shim-spin/Cargo.toml b/containerd-shim-spin/Cargo.toml
@@ -32,3 +32,6 @@ serde_json = "1.0"
 url = "2.3"
 anyhow = "1.0"
 oci-spec = { version = "0.6.3" }
+futures = "0.3"
+ctrlc = { version = "3.2", features = ["termination"] }
+
diff --git a/containerd-shim-spin/src/engine.rs b/containerd-shim-spin/src/engine.rs
@@ -198,7 +198,22 @@ impl SpinEngine {
             }
         };
         info!(" >>> notifying main thread we are about to start");
-        f.await
+        let (abortable, abort_handle) = futures::future::abortable(f);
+        ctrlc::set_handler(move || abort_handle.abort())?;
+        match abortable.await {
+            Ok(Ok(())) => {
+                info!("Trigger executor shut down: exiting");
+                Ok(())
+            }
+            Ok(Err(err)) => {
+                log::error!("ERROR >>> Trigger executor failed: {:?}", err);
+                Err(err)
+            }
+            Err(aborted) => {
+                info!("Received signal to abort: {:?}", aborted);
+                Ok(())
+            }
+        }
     }
 
     async fn load_resolved_app_source(