Merge pull request #1371 from Phala-Network/fix-sidevm-stucks

pRuntime: Fix sidevm stucks at restart
Phala-Network · Aug 29, 2023 · 6cea02d · 6cea02d
2 parents ec8ea54 + aba7eba
commit 6cea02d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/crates/phala-scheduler/src/task_scheduler.rs b/crates/phala-scheduler/src/task_scheduler.rs
@@ -37,6 +37,10 @@ impl<TaskId: TaskIdType> TaskScheduler<TaskId> {
         self.inner.lock().unwrap().poll_resume(cx, task_id, weight)
     }
 
+    pub fn reset(&self, task_id: &TaskId) {
+        self.exit(task_id)
+    }
+
     pub fn exit(&self, task_id: &TaskId) {
         self.inner.lock().unwrap().exit(task_id)
     }

diff --git a/crates/sidevm/host-runtime/src/run.rs b/crates/sidevm/host-runtime/src/run.rs
@@ -24,7 +24,8 @@ pub struct WasmRun {
 
 impl Drop for WasmRun {
     fn drop(&mut self) {
-        self.env.cleanup()
+        self.env.cleanup();
+        self.scheduler.exit(&self.id);
     }
 }
 
@@ -73,6 +74,7 @@ impl WasmRun {
         env.set_instance(instance);
         env.set_gas_per_breath(gas_per_breath);
         env.set_weight(weight);
+        scheduler.reset(&id);
         Ok((
             WasmRun {
                 env: env.clone(),