Changeset 1a4ee0f

Timestamp:

May 12, 2010 7:25:53 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

d2471df

Parents:

bf3e812

Message:

pickling the dict version of the topology object doesn't fail, but the raw object faile to pickle intermittently. >sigh<

File:

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

fedd/federation/experiment_control.py

@@ -1576 +1576 @@
         Creates a working directory, splits the incoming description using the
         splitter script and parses out the various subsections using the
-        classes above.  Once each sub-experiment is created, use pooled threads
-        to instantiate them and start it all up.
+        classes above.  Once each sub-experiment is created, use pooled threads
+        to instantiate them and start it all up.
         """
 
@@ -1690 +1690 @@
 
             hosts, ip_allocator = self.allocate_ips_to_topo(top)
-             # Find the testbeds to look up
+            # Find the testbeds to look up
             testbeds = set([ a.value for e in top.elements \
                     for a in e.attribute \
@@ -1797 +1797 @@
             self.state[eid]['vis'] = vis
             self.state[eid]['experimentdescription'] = \
-                    { 'topdldescription': top.clone() }
-            self.state[expid]['federant'] = \
+                    { 'topdldescription': top.to_dict() }
+            self.state[eid]['federant'] = \
                     [ tbparams[tb]['federant'] for tb in tbparams.keys() \
                         if tbparams[tb].has_key('federant') ]