Merge pull request #102 from golemcloud/fix-golem-exec-python

Hand-written remove-dir-all to solve infinite loop

Author: vigoo

Cargo.lock

@@ -27,7 +27,7 @@ hex = "0.4.3"
 indoc = "2.0.6"
 log = { workspace = true }
 rquickjs = { version = "0.9.0", default-features = false, features = ["futures", "bindgen", "loader", "macro"], optional = true }
-rustpython = { git = "https://github.com/RustPython/RustPython", rev = "d8f1d188c394eb2d970d3ebe95f0d3d7658f31a3", default-features = false, features = ["stdlib", "stdio", "importlib", "freeze-stdlib"], optional = true }
+rustpython = { git = "https://github.com/RustPython/RustPython", rev = "6ead82154e06a4490c0a87b966db5528eee13070", default-features = false, features = ["stdlib", "stdio", "importlib", "freeze-stdlib"], optional = true }
 wasi = { workspace = true }
 wasi-logger = "0.1.2"
 wit-bindgen = { version = "0.40.0" }

exec/exec/Cargo.toml

@@ -11,6 +11,7 @@ use rustpython::{vm, InterpreterConfig};
 use std::cell::RefCell;
 use std::path::{Path, PathBuf};
 use std::sync::atomic::AtomicU32;
+use std::{fs, io};
 use wstd::time::Instant;
 
 static TEMP_DIR_COUNTER: AtomicU32 = AtomicU32::new(0);
@@ -395,7 +396,21 @@ impl Drop for PythonSession {
             state.interpreter.finalize(state.last_error.take());
         }
 
-        let _ = std::fs::remove_dir_all(&self.data_root);
-        let _ = std::fs::remove_dir_all(&self.module_root);
+        let _ = remove_dir_all(&self.data_root);
+        let _ = remove_dir_all(&self.module_root);
     }
 }
+
+pub fn remove_dir_all<P: AsRef<Path>>(path: P) -> io::Result<()> {
+    for child in fs::read_dir(&path)? {
+        let child = child?;
+        let metadata = child.metadata()?;
+        let path = child.path();
+        if metadata.is_dir() {
+            remove_dir_all(&path)?;
+        } else if metadata.is_file() {
+            fs::remove_file(&path)?;
+        }
+    }
+    fs::remove_dir(&path)
+}