Changeset 63f7c7e for fedkit/splitter.pl

Timestamp:

Sep 4, 2007 6:52:58 PM (17 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:

c23025e

Parents:

61f19e0

Message:

add hosts fixup

File:

• fedkit/splitter.pl (modified) (10 diffs)

fedkit/splitter.pl

@@ -2 +2 @@
 
 use Getopt::Std;
+
+@scripts = ("federate.sh", "smbmount.pl");
+$local_script_dir = ".";
 
 # use scp to transfer a file, reporting true if successful and false otherwise.
@@ -41 +44 @@
     }
     else { return 1; }
+}
+
+# Ship local copies of the federation scripts out to the given host.  If any of
+# the script transfers fails, return 0.  The scripts to transfer are from the
+# global @scripts and are found locally in $local_script_dir (another global).
+sub ship_scripts {
+    my($host, $user, $dest_dir) = @_;       # Where, who, where remotely
+    my($s);
+
+    for $s (@scripts) {
+        &scp_file("$local_script_dir/$s", "$user\@$host", $dest_dir) || 
+            return 0;
+    }
+    return 1;
 }
 
@@ -60 +77 @@
     my($tclfile) = "./$eid.$tb.tcl";        # Local tcl file with the
                                             # sub-experiment
-    my($to_hostname) = "/proj/$pid/hosts.$eid"; # remote hostnames file
+    my($proj_dir) = "/proj/$pid/exp/$eid/tmp";  # Where to stash federation stuff
+    my($to_hostname) = "$proj_dir/hosts";   # remote hostnames file
 
     # Determine the status of the remote experiment
@@ -79 +97 @@
     print "$tb: $state\n";
 
-    # Copy the configuration data over (unless the host is local)
+    # Copy the experiment definition data over (unless the host is local)
     if ( $host ne "localhost") {
         &scp_file($tclfile, "$user\@$host") || return 0;
-        &scp_file("./hostnames", "$user\@$host", $to_hostname) || return 0;
     }
 
     # Remote experiment is active.  Modify it.
     if ($state eq "active") {
+        # First copy new scripts and hostinfo into the remote /proj
+        &scp_file("./hostnames", "$user\@$host", $to_hostname) || return 0;
+        &ship_scripts($host, $user, $proj_dir) || return 0;
         &ssh_cmd($user, $host, "/usr/testbed/bin/modexp -r -s -w $pid " . 
             "$eid $tclfile", "modexp") || return 0;
@@ -96 +116 @@
         &ssh_cmd($user, $host, "/usr/testbed/bin/modexp -w $pid $eid $tclfile", 
             "modexp") || return 0;
+        # First copy new scripts and hostinfo into the remote /proj
+        &scp_file("./hostnames", "$user\@$host", $to_hostname) || return 0;
+        &ship_scripts($host, $user, $proj_dir) || return 0;
+        # Now start up
         &ssh_cmd($user, $host, "/usr/testbed/bin/swapexp -w $pid $eid in", 
             "swapexp") || return 0;
@@ -101 +125 @@
     }
 
-    # No remote experiment.  Create one.
+    # No remote experiment.  Create one.  We do this in 2 steps so we can put
+    # the configuration files and scripts into the new experiment directories.
     if ($state eq "none") {
-        &ssh_cmd($user, $host, "/usr/testbed/bin/startexp -i -w -p " . 
+        &ssh_cmd($user, $host, "/usr/testbed/bin/startexp -f -w -p " . 
             "$pid -e $eid $tclfile", "startexp") || return 0;
+        # First copy new scripts and hostinfo into the remote /proj
+        &scp_file("./hostnames", "$user\@$host", $to_hostname) || return 0;
+        &ship_scripts($host, $user, $proj_dir) || return 0;
+        # Now start up
+        &ssh_cmd($user, $host, "/usr/testbed/bin/swapexp -w $pid $eid in", 
+            "swapexp") || return 0;
         return 1;
     }
@@ -138 +169 @@
 
 # Argument processing.
-getopts('c:m:e:f:n', \%opts);
+getopts('d:c:m:e:f:n', \%opts);
 
 $eid = $opts{'e'};                  # Experiment ID
@@ -145 +176 @@
 $startem = $opts{'n'} ? 0 : 1;      # If true, start the sub-experiments
 $config = $opts{'c'} || "./testbeds";
+$local_script_dir = $opts{'d'};     # Local scripts
+
+for $s (@scripts) {
+    die "$local_script_dir/$s not in local script directory. Try -d\n"
+        unless -r "$local_script_dir/$s";
+}
 
 die "Must supply file, master and experiment" unless $master && $tcl && $eid;
@@ -265 +302 @@
 
 B<splitter.pl> B<-e> I<experiment> B<-m> I<master_testbed> [B<-n>] 
-    [B<-c> I<config_file>] [B<-f> I<experiment_tcl>] [I<experiment_tcl>]
+    [B<-d> F<script_dir>] [B<-c> F<config_file>] [B<-f> F<experiment_tcl>]
+    [F<experiment_tcl>]
 
 =head1 DESCRIPTION
@@ -289 +327 @@
 currently instantiated last.
 
+Scripts to start federation are copied into the local experiment's tmp file -
+e.g., F</proj/DETER/exp/simple-split/tmp>.  These are taken from the directory
+given by the B<-d> option.
+
 If any sub-experiment fails to instantiate, the other sub-exeriments are
 swapped out.