Changeset e07c8f3

Timestamp:

Jun 1, 2010 8:02:00 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

1502580

Parents:

5767b20

Message:

Remove software, etc when experiment swaps out

Fix a couple small bugs in access controller that I believed were fixed before.

Location:

fedd/federation

Files:

• emulab_access.py (modified) (2 diffs)
• experiment_control.py (modified) (4 diffs)

fedd/federation/emulab_access.py

@@ -612 +612 @@
                                         "dragonportal ip %s vlan %s " + \
                                         "netmask 255.255.255.0\n") % \
-                                        (e.name, addr, vlan)
+                                        (topdl.to_tcl_name(e.name), addr, vlan)
                             elif type =='lan':
                                 s = ("tb-allow-external ${%s} " + \
                                         "dragonportal " + \
                                         "ip %s vlan %s usurp %s\n") % \
-                                        (e.name, addr, vlan, subs)
+                                        (topdl.to_tcl_name(e.name), addr, 
+                                                vlan, subs)
                             else:
                                 raise service_error(service_error_internal,
@@ -824 +825 @@
         # If this is the seer master, add that node, too.
         if seer_master:
-            self.add_seer_node(topo, 'seer-master', self.seer_master_start)
+            self.add_seer_node(topo, 'seer-master', 
+                    "%s -R -n -R seer-master -R -A -R sink" % \
+                            self.seer_master_start)
 
     def retrieve_software(self, topo, certfile, softdir):

fedd/federation/experiment_control.py

@@ -2134 +2134 @@
         return rv
 
+    def remove_dirs(self, dir):
+        """
+        Remove the directory tree and all files rooted at dir.  Log any errors,
+        but continue.
+        """
+        self.log.debug("[removedirs]: removing %s" % dir)
+        try:
+            for path, dirs, files in os.walk(dir, 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(dir)
+        except EnvironmentError, e:
+            self.log.error("Error deleting directory tree in %s" % e);
+
     def terminate_experiment(self, req, fid):
         """
@@ -2175 +2191 @@
         self.state_lock.acquire()
         fed_exp = self.state.get(key, None)
+        repo = None
 
         if fed_exp:
@@ -2205 +2222 @@
             #  keys of self.state - and puts them into ids.
             for id in fed_exp.get('experimentID', []):
-                if id.has_key('fedid'): ids.append(id['fedid'])
+                if id.has_key('fedid'): 
+                    ids.append(id['fedid'])
+                    repo = "%s" % id['fedid']
                 if id.has_key('localname'): ids.append(id['localname'])
 
@@ -2276 +2295 @@
                     pass
             self.write_store()
+
+            # Remove software and other cached stuff from the filesystem.
+            if repo:
+                self.remove_dirs("%s/%s" % (self.repodir, repo))
                 
             return {