Changeset f52f5df for fedd/federation/experiment_control.py

Timestamp:

Mar 1, 2010 11:32:32 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

6d07908

Parents:

dadc4da

Message:

correctly handle synch revocation

File:

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

fedd/federation/experiment_control.py

@@ -1081 +1081 @@
                     % mins)
             if not revoked and \
-                    len([ t.getName() for t in threads if not t.rv ]) > 0:
+                    len([ t.getName() for t in threads if t.rv == False]) > 0:
                 # a testbed has failed.  Revoke this experiment's
                 # synchronizarion values so that sub experiments will not
@@ -1092 +1092 @@
                         self.synch_store.revoke_key(k)
                 revoked = True
-
-        thread_pool.clear()
 
         failed = [ t.getName() for t in threads if not t.rv ]
@@ -1117 +1115 @@
                             pdata=thread_pool, trace_file=self.trace_file)
                     t.start()
-                # Wait until all finish
-                thread_pool.wait_for_all_done()
+                # Wait until all finish (if any are being stopped)
+                if succeeded:
+                    thread_pool.wait_for_all_done()
 
                 # release the allocations