Changeset 05e8da8 for fedd

Timestamp:

Jun 22, 2010 6:38:07 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

2b6e64d1

Parents:

9e38ded

Message:

cleanup on failure

File:

• fedd/federation/experiment_control.py (modified) (2 diffs)

fedd/federation/experiment_control.py

@@ -1221 +1221 @@
                 if self.state_filename: self.write_state()
                 self.state_lock.release()
+                # Remove the repo dir
+                self.remove_dirs("%s/%s" %(self.repodir, expid))
+                # Walk up tmpdir, deleting as we go
+                if self.cleanup:
+                    self.remove_dirs(tmpdir)
+                else:
+                    log.debug("[start_experiment]: not removing %s" % tmpdir)
+
 
                 log.error("Swap in failed on %s" % ",".join(failed))
@@ -1240 +1248 @@
         # Walk up tmpdir, deleting as we go
         if self.cleanup:
-            log.debug("[start_experiment]: removing %s" % tmpdir)
-            for path, dirs, files in os.walk(tmpdir, topdown=False):
-                for f in files:
-                    os.remove(os.path.join(path, f))
-                for d in dirs:
-                    os.rmdir(os.path.join(path, d))
-            os.rmdir(tmpdir)
+            self.remove_dirs(tmpdir)
         else:
             log.debug("[start_experiment]: not removing %s" % tmpdir)