Changeset 2ef2c5b

Timestamp:

Sep 14, 2007 11:50:23 AM (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:

321c0cb

Parents:

c9f5490

Message:

collect tarfiles info and stage them for federated experiments

File:

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

fedkit/splitter.pl

@@ -83 +83 @@
     my($s);
 
+    &ssh_cmd($user, $host, "mkdir -p $dest_dir");
     for $s (@scripts) {
         &scp_file("$local_script_dir/$s", "$user\@$host", $dest_dir) || 
@@ -96 +97 @@
     my($d, $f);
 
+
     $d = IO::Dir->new($src_dir) || return 0;
 
+    &ssh_cmd($user, $host, "mkdir -p $dest_dir");
     while ( $f = $d->read()) {
         next if $f =~ /^\./;
-        &scp_file("$src_dir/$f", "$user\@$host", $dest_dir) || return 0;
+        if ( -d "$src_dir/$f" ) {
+            &ship_configs($host, $user, "$src_dir/$f", "$dest_dir/$f") || 0;
+        }
+        else {
+            &scp_file("$src_dir/$f", "$user\@$host", $dest_dir) || return 0;
+        }
     }
     return 1;
@@ -156 +164 @@
     # Remote experiment is swapped out, modify it and swap it in.
     if ($state eq "swapped") {
-        &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
+        # First copy new scripts and hostinfo into the remote /proj (because
+        # the experiment exists, the directory tree should be there.
         &scp_file("./hostnames", "$user\@$host", $to_hostname) || return 0;
         &ship_scripts($host, $user, $proj_dir) || return 0;
         &ship_configs($host, $user, "$tmpdir/$tb", $proj_dir) || return 0;
+        &ssh_cmd($user, $host, "/usr/testbed/bin/modexp -w $pid $eid $tclfile", 
+            "modexp") || return 0;
         # Now start up
         &ssh_cmd($user, $host, "/usr/testbed/bin/swapexp -w $pid $eid in", 
@@ -276 +285 @@
 # Open a pipe to the splitter program and start it parsing the experiments
 $pipe = new IO::Pipe;
-$pipe->reader("$tclsh $tcl_splitter -s -m $master -p $pid $gid $eid $tcl") || 
-    die "Cannot execute $tclsh $tcl_splitter -s -p $pid $gid $eid $tcl:$!\n";
+# NB no more -p call on parse call.
+$pipe->reader("$tclsh $tcl_splitter -s -m $master  $pid $gid $eid $tcl") || 
+    die "Cannot execute $tclsh $tcl_splitter -s -m $master $pid $gid $eid $tcl:$!\n";
 
 # Parse the splitter output.  This loop creates the sub experiments, gateway
@@ -406 +416 @@
         next; 
     };
-
+    (/^#\s+Begin\s+tarfiles/../^#\s+End\s+tarfiles/) && do {
+        next if /^#/;
+        chomp;
+        push(@tarfiles, $_);
+        next;
+    };
 
     next unless $destfile;  # Unidentified testbed, ignore config
@@ -428 +443 @@
 $pipe->close();
 die "No nodes in master testbed ($master)\n" unless $allocated{$master};
+
+for $t (@tarfiles) {
+    die "tarfile '$t' unreadable: $!\n" unless -r $t;
+    for $tb (keys %allocated) {
+        unless (-d "$tmpdir/$tb/tarfiles") {
+            mkdir("$tmpdir/$tb/tarfiles") || 
+                die "Can't create $tmpdir/$tb/tarfiles:$!\n";
+        }
+        copy($t, "$tmpdir/$tb/tarfiles") || 
+                die "Can't copy $t to  $tmpdir/$tb/tarfiles:$!\n";
+    }
+}
 
 exit(0) unless $startem;