Changeset 35a4c01

Timestamp:

Mar 12, 2010 2:32:38 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

d46b1d5

Parents:

86a7bb8

Message:

Access controllers manage the fedkit now. Also upped the parallelism for
swapins.

File:

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

fedd/federation/experiment_control.py

@@ -227 +227 @@
         set_log_level(config, "experiment_control", self.log)
         self.muxmax = 2
-        self.nthreads = 2
+        self.nthreads = 10
         self.randomize_experiments = False
 
@@ -1332 +1332 @@
                 topo[tb].elements.remove(e)
             topo[tb].make_indices()
-
-            for e in [ e for e in topo[tb].elements \
-                    if isinstance(e,topdl.Computer)]:
-                if self.fedkit: self.add_kit(e, self.fedkit)
 
     def new_portal_node(self, st, dt, tbparams, master, eid, myname, desthost,
@@ -1718 +1714 @@
                 ((tsubstrate.name,(('portal','true'),)),), conn_type="ssh",
                 conn_attrs=[], expid=expid)
-        if self.fedkit:
-            self.add_kit(portal, self.fedkit)
-        if self.gatewaykit: 
-            self.add_kit(portal, self.gatewaykit)
 
         topo[st].substrates.append(tsubstrate)
@@ -1742 +1734 @@
                     ('ip4_address', "%s" % ip_addr(myip)),)),),
                 conn_type="transit", conn_attrs=[], expid=expid)
-        if self.fedkit:
-            self.add_kit(portal, self.fedkit)
-        if self.gatewaykit: 
-            self.add_kit(portal, self.gatewaykit)
 
         return portal
@@ -2134 +2122 @@
                     str(self.muxmax), '-m', master]
 
-                if self.fedkit:
-                    tclcmd.append('-k')
-
-                if self.gatewaykit:
-                    tclcmd.append('-K')
-
                 tclcmd.extend([pid, gid, eid, tclfile])