Changeset 33e3537 for fedkit

Timestamp:

Apr 11, 2008 2:12:04 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:

2396559e

Parents:

8034579

Message:

events to both federants - start repeaters on both sides of the gateway

Location:

fedkit

Files:

• fed-tun.pl (modified) (3 diffs)
• splitter.pl (modified) (2 diffs)

fedkit/fed-tun.pl

@@ -35 +35 @@
 my $PUBSUB_PORT = 16505;
 
+
+my $remote_pubsub_port = $PUBSUB_PORT - 1;  # There will be a local
+                                            # pubsubd running, so we
+                                            # dodge the port on the
+                                            # remote tunnel node.
 sub setup_bridging;
 sub setup_tunnel_cfg;
@@ -108 +113 @@
 
     if (defined($opts{'bossname'})) {
-        my $remote_pubsub_port = $PUBSUB_PORT - 1;  # There will be a local
-                                                    # pubsubd running, so we
-                                                    # dodge the port on the
-                                                    # remote tunnel node.
         $ssh_port_fwds .= "-R :$TMCD_PORT:$opts{'bossname'}:$TMCD_PORT ";
+    }
+
+    if (defined($opts{'eventservername'})) {
         $ssh_port_fwds .= "-R :$remote_pubsub_port:$opts{'eventservername'}:" . 
             "$PUBSUB_PORT ";
+    }
+    if (defined($opts{'remoteeventservername'})) {
+        $ssh_port_fwds .= "-L :$remote_pubsub_port:" . 
+            "$opts{'remoteeventservername'}:$PUBSUB_PORT ";
     }
 
@@ -195 +203 @@
     }
     close(IFFILE);
+
+    # Start a local event repeater (unless we're missing parameters 
+    die "Missing event repeater params (No config file ?)\n"
+        unless $event_repeater && $opts{'remoteexperiment'} && 
+        $opts{'localexperiment'};
+
+    print "Starting event repeater\n" if $debug;
+    
+    print("$event_repeater -M -P $remote_pubsub_port -S localhost " . 
+        "-E $opts{'remoteexperiment'} -e $opts{'localexperiment'}\n") 
+        if $debug;
+    # Connect to the forwarded pubsub port on this host to listen to the
+    # other experiment's events, and to the local experiment to forward
+    # events.
+    system("$event_repeater -M -P $remote_pubsub_port -S localhost " . 
+        "-E $opts{'remoteexperiment'} -e $opts{'localexperiment'}");
+    warn "Event repeater returned $?\n" if $?;
 } elsif ($remote) {
     # We're on the remote system;  figure out which interface to 

fedkit/splitter.pl

@@ -649 +649 @@
             $tbparams->{$master}->{'eventserver'} .  
             $tbparams->{$master}->{'domain'};
+        my $remote_event_server =               # Slave event-server (FQDN)
+            $tbparams->{$dtb}->{'eventserver'} .  
+            $tbparams->{$dtb}->{'domain'};
         my $remote_script_dir =                 # Remote fed script location
             "/proj/" . $dproject . "/exp/$eid/tmp";
@@ -688 +691 @@
         print $gwconfig "FsName: $fs\n";
         print $gwconfig "EventServerName: $event_server\n";
+        print $gwconfig "RemoteEventServerName: $remote_event_server\n";
         print $gwconfig "Type: $type\n";
         print $gwconfig "RemoteScriptDir: $remote_script_dir\n";