Merge pull request #1391 from eclipse-zenoh/fix-zombie-orchestrator

Fix orchestrator not dying after being killed
eclipse-zenoh · Sep 10, 2024 · 485194b · 485194b
2 parents 16ddfad + 00837d3
commit 485194b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/zenoh/src/net/runtime/mod.rs b/zenoh/src/net/runtime/mod.rs
@@ -289,6 +289,13 @@ impl Runtime {
         Ok(())
     }
 
+    pub fn is_closed(&self) -> bool {
+        self.state
+            .task_controller
+            .get_cancellation_token()
+            .is_cancelled()
+    }
+
     pub fn new_timestamp(&self) -> Option<uhlc::Timestamp> {
         self.state.hlc.as_ref().map(|hlc| hlc.new_timestamp())
     }

diff --git a/zenoh/src/net/runtime/orchestrator.rs b/zenoh/src/net/runtime/orchestrator.rs
@@ -1137,10 +1137,15 @@ impl Runtime {
     }
 
     pub(super) fn closing_session(session: &RuntimeSession) {
+        if session.runtime.is_closed() {
+            return;
+        }
+
         match session.runtime.whatami() {
             WhatAmI::Client => {
                 let runtime = session.runtime.clone();
                 let cancellation_token = runtime.get_cancellation_token();
+
                 session.runtime.spawn(async move {
                     let retry_config = runtime.get_global_connect_retry_config();
                     let mut period = retry_config.period();