Changeset 3132419

Timestamp:

Feb 15, 2010 8:51:04 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

c3a3fe3

Parents:

1899afd

Message:

Parallel starts now.

File:

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

fedd/federation/experiment_control.py

@@ -986 +986 @@
         fail_soft = False
 
-        slaves = [ k for k in allocated.keys() \
-                if k != master and not topo[k].get_attribute('transit')]
+        non_transit = [ k for k in allocated.keys() \
+                if not topo[k].get_attribute('transit')]
         transit = [ k for k in allocated.keys() \
                 if topo[k].get_attribute('transit')]
@@ -1052 +1052 @@
 
         if len(failed) == 0:
-            for tb in slaves:
+            for tb in non_transit:
                 # Create and start a thread to start the segment, and save it
                 # to get the return value later
@@ -1075 +1075 @@
                             caller=self.call_StartSegment,
                             log_collector=log_collector), 
-                        args=(uri, aid, topo[tb], False, attrs, connInfo[tb],
-                            services),
+                        args=(uri, aid, topo[tb], tb == master, 
+                            attrs, connInfo[tb], services),
                         name=tb,
                         pdata=thread_pool, trace_file=self.trace_file)
@@ -1091 +1091 @@
             thread_pool.clear()
 
-        # If none failed, start the master
         failed = [ t.getName() for t in threads if not t.rv ]
-
-        if len(failed) == 0:
-            uri = self.tbmap.get(master, None)
-            if not uri:
-                raise service_error(service_error.internal, 
-                        "Unknown testbed %s !?" % master)
-
-            if tbparams[master].has_key('allocID') and \
-                    tbparams[master]['allocID'].has_key('fedid'):
-                aid = tbparams[master]['allocID']['fedid']
-            else:
-                raise service_error(service_error.internal, 
-                    "No alloc id for testbed %s !?" % master)
-            t = self.pooled_thread(
-                    target=self.start_segment(log=log, debug=self.debug, 
-                        testbed=master, cert_file=self.cert_file, 
-                        cert_pwd=self.cert_pwd, 
-                        trusted_certs=self.trusted_certs,
-                        caller=self.call_StartSegment,
-                        log_collector=log_collector),
-                    args =(uri, aid, topo[master], True, attrs, 
-                        connInfo[master], services),
-                    name=master, pdata=thread_pool, trace_file=self.trace_file)
-            threads.append(t)
-            t.start()
-            # Wait until the master finishes (keep pinging the log, though)
-            mins = 0
-            while not thread_pool.wait_for_all_done(60.0):
-                mins += 1
-                alloc_log.info("Waiting for master (it has been %d mins)" \
-                        % mins)
-            # update failed to include the master, if it failed
-            failed = [ t.getName() for t in threads if not t.rv ]
-
         succeeded = [tb for tb in allocated.keys() if tb not in failed]
+
         # If one failed clean up, unless fail_soft is set
         if failed: