Changeset 27b6aea

Timestamp:

Sep 11, 2008 5:07:31 PM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

c52c48d

Parents:

89d9502

Message:

seer private pubsub support

Files:

• fedd/fedd_create_experiment.py (modified) (2 diffs)
• fedkit/fed-tun.pl (modified) (2 diffs)
• fedkit/federate.sh (modified) (3 diffs)

fedd/fedd_create_experiment.py

@@ -841 +841 @@
             fs = tbparams[master].get('fs', "fs")
             event_server = "%s%s" % \
-                    (tbparams[master].get('eventserver', "event_server"),
-                            tbparams[master].get('domain', "example.com"))
+                    (tbparams[gw].get('eventserver', "event_server"),
+                            tbparams[gw].get('domain', "example.com"))
             remote_event_server = "%s%s" % \
                     (tbparams[dtb].get('eventserver', "event_server"),
                             tbparams[dtb].get('domain', "example.com"))
-
+            seer_control = "%s%s" % \
+                    (tbparams[gw].get('control', "control"), sdomain)
             remote_script_dir = "/proj/%s/exp/%s/tmp" % ( dproject, eid)
             local_script_dir = "/proj/%s/exp/%s/tmp" % ( sproject, eid)
@@ -876 +877 @@
             print >>gwconfig, "EventServerName: %s" % event_server
             print >>gwconfig, "RemoteEventServerName: %s" % remote_event_server
+            print >>gwconfig, "SeerControl: %s" % seer_control
             print >>gwconfig, "Type: %s" % type
             print >>gwconfig, "RemoteScriptDir: %s" % remote_script_dir

fedkit/fed-tun.pl

@@ -34 +34 @@
 my $SMBFS_PORT = 139;
 my $PUBSUB_PORT = 16505;
+my $SEER_PORT = 16606;
 
 
@@ -126 +127 @@
     }
 
+    # Forward connections to seer from remote TBs to control in this TB
+    if (defined($opts{'seercontrol'})) {
+        push(@ssh_port_fwds,"-R :$SEER_PORT:$opts{seercontrol}:$SEER_PORT");
+    }
+
     @ssh_port_fwds = () if ($opts{'type'} eq 'experiment');
 

fedkit/federate.sh

@@ -56 +56 @@
 
 # Find this experiment's stashed scripts.  (Perl for advanced parsing)
-SCRIPTDIR=`$EMUDIR/tmcc -b status | $PERL -ne '/ALLOCATED=([^\/]+)\/([^\s]+)/ && print "/proj/$1/exp/$2/tmp\n";'`
+PROJECT=`$EMUDIR/tmcc -b status | $PERL -ne '/ALLOCATED=([^\/]+)\/([^\s]+)/ && print "$1\n";'`
+EXP=`$EMUDIR/tmcc -b status | $PERL -ne '/ALLOCATED=([^\/]+)\/([^\s]+)/ && print "$2\n";'`
+SCRIPTDIR="/proj/$PROJECT/exp/$EXP/tmp"
 
 # Die if Scripts are not where they should be.  NB, this is checked by the
@@ -66 +68 @@
 fi
 
-# Copy the global hostnames file into /etc/hosts so this node can address
-# others in the experiment on other testbeds.  The extra steps preserves teh
-# localhost entry that's aliased to this host's name.
-grep 127\\.0\\.0\\.1 /etc/hosts > /tmp/hosts
-cat "$SCRIPTDIR/hosts" >> /tmp/hosts
-cp /tmp/hosts /etc/hosts && rm /tmp/hosts
-
 # Get our gateway, share, and mount user from the configuration file.
 # There's probably a way to get all three at once, but this works.
@@ -79 +74 @@
 SMBUSER=`$PERL -ne '/ProjectUser:\s+(.*)/i && print "$1\n";' $SCRIPTDIR/client.conf`
 SMBPROJECT=`$PERL -ne '/ProjectName:\s+(.*)/i && print "$1\n";' $SCRIPTDIR/client.conf`
+
+GWIP=`host -N 10 $GATEWAY | $PERL -ne 's/.* has address // && print;'`
+# Copy the global hostnames file into /etc/hosts so this node can address
+# others in the experiment on other testbeds.  The extra steps preserves teh
+# localhost entry that's aliased to this host's name. 
+grep 127\\.0\\.0\\.1 /etc/hosts > /tmp/hosts
+cat "$SCRIPTDIR/hosts" >> /tmp/hosts
+# If there's no node in this experiment called control, fake one so
+# that SEER events get through (if SEER's in use)
+if ! grep -q control $SCRIPTDIR/hosts; then
+        echo "$GWIP     control.$EXP.$PROJECT" >> /tmp/hosts
+fi
+cp /tmp/hosts /etc/hosts && rm /tmp/hosts
 
 # XXX: