Changeset 63a35b7

Timestamp:

Nov 3, 2009 11:52:28 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

1da94bc

Parents:

6409cc5

Message:

Correctly track testbed allocations (slivers or sub experiments). This is
still kludgier than I'd like, but produces the correct operations.

File:

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

fedd/federation/experiment_control.py

@@ -2419 +2419 @@
                 if id.has_key('localname'): ids.append(id['localname'])
 
-            # Collect the allocation/segment ids
-            for fed in fed_exp.get('federant', []):
+            # Collect the allocation/segment ids into a dict keyed by the fedid
+            # of the allocation (or a monotonically increasing integer) that
+            # contains a tuple of uri, aid (which is a dict...)
+            for i, fed in enumerate(fed_exp.get('federant', [])):
                 try:
-                    tb = fed['uri']
-                    aid = fed['allocID']
+                    uri = fed['uri']
+                    aid = fed['allocID']
+                    k = fed['allocID'].get('fedid', i)
                 except KeyError, e:
                     continue
-                tbparams[tb] = aid
+                tbparams[k] = (uri, aid)
             fed_exp['experimentStatus'] = 'terminating'
             if self.state_filename: self.write_state()
@@ -2436 +2439 @@
             if len(tbparams) > 0:
                 thread_pool = self.thread_pool(self.nthreads)
-                for tb in tbparams.keys():
+                for k in tbparams.keys():
                     # Create and start a thread to stop the segment
                     thread_pool.wait_for_slot()
-                    #uri = self.tbmap.get(tb, None)
-                    uri = tb
+                    uri, aid = tbparams[k]
                     t  = self.pooled_thread(\
                             target=self.terminate_segment(log=dealloc_log,
-                                testbed=tb,
+                                testbed=uri,
                                 cert_file=self.cert_file, 
                                 cert_pwd=self.cert_pwd,
                                 trusted_certs=self.trusted_certs,
                                 caller=self.call_TerminateSegment),
-                            args=(uri, tbparams[tb]), name=tb,
+                            args=(uri, aid), name=k,
                             pdata=thread_pool, trace_file=self.trace_file)
                     t.start()
@@ -2458 +2460 @@
             # ignore errors releasing those allocations
             try: 
-                for tb in tbparams.keys():
+                for k in tbparams.keys():
                     # This releases access by uri
-                    self.release_access(None, tbparams[tb], uri=tb)
+                    uri, aid = tbparams[k]
+                    self.release_access(None, aid, uri=uri)
             except service_error, e:
                 if status != 'failed' and not force: