Changeset e2a71ebe

Timestamp:

Oct 3, 2007 9:10:01 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:

33548e1

Parents:

637adfa

Message:

remote rpms

File:

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

fedkit/splitter.pl

@@ -30 +30 @@
 my $tclsh;                      # tclsh to call directly (changed during devel)
 my @tarfiles;                   # Tarfiles in use by this experiment
+my @rpms;                       # Rpms in use by this experiment
 my $timeout;                    # The timeout to use for experiment swap ins
 my %opts;                       # Parsed options
@@ -83 +84 @@
     my $fh = new IO::File($file);  # Testbeds filehandle
     my $tb;                         # Current testbed
-    # Convert attribute in the file to global variable name.  XXX: Again, this
-    # needs to be a 2-level hash
+    # Convert attribute in the file to tbparams hash key
     my %attr_to_hash = (
         "opsnode" => "host",
@@ -273 +273 @@
     my $proj_dir = "/proj/$pid/exp/$eid/tmp";  # Where to stash federation stuff
     my $tarfiles_dir = "/proj/$pid/tarfiles/$eid";  # Where to stash tarfiles
+    my $rpms_dir = "/proj/$pid/rpms/$eid";  # Where to stash rpms
     my $to_hostname = "$proj_dir/hosts";    # remote hostnames file
     my $state;                              # State of remote experiment
@@ -307 +308 @@
     &ssh_cmd($user, $host, "mkdir -p $tarfiles_dir", "create tarfiles") || 
         return 0;
+    print "clearing experiment rpms subdirs on $tb\n" if $verbose;
+    &ssh_cmd($user, $host, "/bin/rm -rf $rpms_dir/") || 
+        return 0;
+    print "creating rpms subdir $rpms_dir on $tb\n" if $verbose;
+    &ssh_cmd($user, $host, "mkdir -p $rpms_dir", "create rpms") || 
+        return 0;
     # Remote experiment is active.  Modify it.
     if ($state eq "active") {
@@ -315 +322 @@
         &ship_scripts($host, $user, $proj_dir) || return 0;
         &ship_configs($host, $user, "$tmpdir/$tb", $proj_dir) || return 0;
+
         if ( -d "$tmpdir/tarfiles") {
             &ship_configs($host, $user, "$tmpdir/tarfiles", $tarfiles_dir) || 
+                return 0;
+        }
+
+        if ( -d "$tmpdir/rpms") {
+            &ship_configs($host, $user, "$tmpdir/rpms", $rpms_dir) || 
                 return 0;
         }
@@ -340 +353 @@
         }
 
+        if ( -d "$tmpdir/rpms") {
+            &ship_configs($host, $user, "$tmpdir/rpms", $rpms_dir) || 
+                return 0;
+        }
+
         print "Modifying $eid on $tb\n" if $verbose;
         &ssh_cmd($user, $host, "/usr/testbed/bin/modexp -w $pid $eid $tclfile", 
@@ -360 +378 @@
                 return 0;
         }
+
+        if ( -d "$tmpdir/rpms") {
+            &ship_configs($host, $user, "$tmpdir/rpms", $rpms_dir) || 
+                return 0;
+        }
+
         print "Creating $eid on $tb\n" if $verbose;
         &ssh_cmd($user, $host, "/usr/testbed/bin/startexp -i -f -w -p " . 
             "$pid -e $eid $tclfile", "startexp") || return 0;
+        # After startexp succeeds, the per-experiment directories exist on the
+        # remote testbed.
         print "Transferring federation support files to $tb\n" if $verbose;
         # First copy new scripts and hostinfo into the remote /proj
@@ -688 +714 @@
         next;
     };
+    (/^#\s+Begin\s+rpms/../^#\s+End\s+rpms/) && do {
+        next if /^#/;
+        chomp;
+        push(@rpms, $_);
+        next;
+    };
 
     next unless $destfile;  # Unidentified testbed, ignore config
@@ -720 +752 @@
 die "No nodes in master testbed ($master)\n" unless $allocated{$master};
 
+# Copy tarfiles and rpms needed at remote sites to the staging directories.
+# Start_segment will distribute them
 for my $t  (@tarfiles) {
     die "tarfile '$t' unreadable: $!\n" unless -r $t;
@@ -728 +762 @@
     copy($t, "$tmpdir/tarfiles") || 
         die "Can't copy $t to  $tmpdir/tarfiles:$!\n";
+}
+
+for my $r  (@rpms) {
+    die "rpm '$r' unreadable: $!\n" unless -r $r;
+    unless (-d "$tmpdir/rpms") {
+        mkdir("$tmpdir/rpms") || 
+            die "Can't create $tmpdir/rpms:$!\n";
+    }
+    copy($r, "$tmpdir/rpms") || 
+        die "Can't copy $r to  $tmpdir/rpms:$!\n";
 }