Changeset c7e40f5

Timestamp:

Nov 26, 2008 3:09:25 PM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

40eab39

Parents:

3584a9f

Message:

Clean up placeholder state on a failed parse

File:

• fedd/fedd_experiment_control.py (modified) (2 diffs)

fedd/fedd_experiment_control.py

@@ -254 +254 @@
         if mapdb_file:
             self.read_mapdb(mapdb_file)
-            print self.tbmap
         else:
             self.log.warn("[experiment_control] No testbed map, using defaults")
@@ -1629 +1628 @@
                 "^#\s+End\s+rpms")
 
-        # Worling on the split data
-        for line in split_data:
-            line = line.rstrip()
-            if parse_current_testbed(line, master, allocated, tbparams):
-                continue
-            elif parse_allbeds(line, user, tbparams, master, export_project,
-                    access_user):
-                continue
-            elif parse_gateways(line, allocated, tbparams):
-                continue
-            elif parse_vtopo(line):
-                continue
-            elif parse_hostnames(line):
-                continue
-            elif parse_tarfiles(line):
-                continue
-            elif parse_rpms(line):
-                continue
-            else:
-                raise service_error(service_error.internal, 
-                        "Bad tcl parse? %s" % line)
-
+        try: 
+            # Working on the split data
+            for line in split_data:
+                line = line.rstrip()
+                if parse_current_testbed(line, master, allocated, tbparams):
+                    continue
+                elif parse_allbeds(line, user, tbparams, master, export_project,
+                        access_user):
+                    continue
+                elif parse_gateways(line, allocated, tbparams):
+                    continue
+                elif parse_vtopo(line):
+                    continue
+                elif parse_hostnames(line):
+                    continue
+                elif parse_tarfiles(line):
+                    continue
+                elif parse_rpms(line):
+                    continue
+                else:
+                    raise service_error(service_error.internal, 
+                            "Bad tcl parse? %s" % line)
+        except service_error, e:
+            # If something goes wrong in the parse (usually an access error)
+            # clear the placeholder state
+            self.state_lock.acquire()
+            del self.state[eid]
+            self.state_lock.release()
+            raise e
+        
         # Virtual topology and visualization
         vtopo = self.gentopo(parse_vtopo.str)