Fix node cleanup - rmdirs

vshepard · vshepard · commit a61f794c0f6e · 2024-07-01T00:27:47.000+02:00
diff --git a/testgres/node.py b/testgres/node.py
@@ -932,7 +932,7 @@ def cleanup(self, max_attempts=3):
         else:
             rm_dir = self.data_dir    # just data, save logs
 
-        self.os_ops.rmdirs(rm_dir, ignore_errors=True)
+        self.os_ops.rmdirs(rm_dir, ignore_errors=False)
 
         return self
 
diff --git a/testgres/operations/local_ops.py b/testgres/operations/local_ops.py
@@ -4,6 +4,7 @@
 import stat
 import subprocess
 import tempfile
+import time
 
 import psutil
 
@@ -147,8 +148,25 @@ def makedirs(self, path, remove_existing=False):
         except FileExistsError:
             pass
 
-    def rmdirs(self, path, ignore_errors=True):
-        return rmtree(path, ignore_errors=ignore_errors)
+    def rmdirs(self, path, ignore_errors=True, retries=3, delay=1):
+        """
+        Removes a directory and its contents, retrying on failure.
+
+        :param path: Path to the directory.
+        :param ignore_errors: If True, ignore errors.
+        :param retries: Number of attempts to remove the directory.
+        :param delay: Delay between attempts in seconds.
+        """
+        for attempt in range(retries):
+            try:
+                rmtree(path, ignore_errors=ignore_errors)
+                if not os.path.exists(path):
+                    return True
+            except Exception as e:
+                print(f"Error: Failed to remove directory {path} on attempt {attempt + 1}: {e}")
+            time.sleep(delay)
+        print(f"Error: Failed to remove directory {path} after {retries} attempts.")
+        return False
 
     def listdir(self, path):
         return os.listdir(path)
