Changeset a835df7

Timestamp:

Sep 18, 2007 9:36:56 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:

c8c45ee

Parents:

0e23fdb

Message:

Add more progress printouts via -d or -v
flatten the config filenames to lower case so the hacky hostname trick to find config files works.

File:

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

fedkit/splitter.pl

@@ -126 +126 @@
 # of the experiment determined using expinfo.  From that state, the experiment
 # is either created, modified or spapped in.  If everything succeeds, true is
-# returned.
+# returned.  If the global verbose is set progress messages are printed.
 sub start_segment {
     my($tb, $eid) = @_;                     # testbed and experiment ID
@@ -152 +152 @@
 
     # Copy the experiment definition data over 
+    print "transferring subexperiment to $tb\n" if $verbose;
     &scp_file("$tmpdir/$tb/$tclfile", "$user\@$host") || return 0;
     # Clear out any old experiment data; if not deleted, copies over it by
@@ -159 +160 @@
     # tmp around))  Again, this needs to be done more properly once we have a
     # non-ssh interface here.)
+    print "clearing experiment subdirs on $tb\n" if $verbose;
     &ssh_cmd($user, $host, "/bin/sh -c \\'/bin/rm -rf $proj_dir/*\\'") || 
         return 0;
     # Remote experiment is active.  Modify it.
     if ($state eq "active") {
+        print "Transferring federation support files to $tb\n" if $verbose;
         # First copy new scripts and hostinfo into the remote /proj
         &scp_file("$tmpdir/hostnames", "$user\@$host", $to_hostname) ||
@@ -168 +171 @@
         &ship_scripts($host, $user, $proj_dir) || return 0;
         &ship_configs($host, $user, "$tmpdir/$tb", $proj_dir) || return 0;
+
+        print "Modifying $eid in place on $tb\n" if $verbose;
         &ssh_cmd($user, $host, "/usr/testbed/bin/modexp -r -s -w $pid " . 
             "$eid $tclfile", "modexp") || return 0;
@@ -175 +180 @@
     # Remote experiment is swapped out, modify it and swap it in.
     if ($state eq "swapped") {
+        print "Transferring federation support files to $tb\n" if $verbose;
         # First copy new scripts and hostinfo into the remote /proj (because
         # the experiment exists, the directory tree should be there.
@@ -181 +187 @@
         &ship_scripts($host, $user, $proj_dir) || return 0;
         &ship_configs($host, $user, "$tmpdir/$tb", $proj_dir) || return 0;
+
+        print "Modifying $eid on $tb\n" if $verbose;
         &ssh_cmd($user, $host, "/usr/testbed/bin/modexp -w $pid $eid $tclfile", 
             "modexp") || return 0;
+        print "Swapping $eid in on $tb\n" if $verbose;
         # Now start up
         &ssh_cmd($user, $host, "/usr/testbed/bin/swapexp -w $pid $eid in", 
@@ -192 +201 @@
     # the configuration files and scripts into the new experiment directories.
     if ($state eq "none") {
+        print "Creating $exp on $tb\n" if $verbose;
         &ssh_cmd($user, $host, "/usr/testbed/bin/startexp -f -w -p " . 
             "$pid -e $eid $tclfile", "startexp") || return 0;
+        print "Transferring federation support files to $tb\n" if $verbose;
         # First copy new scripts and hostinfo into the remote /proj
         &scp_file("$tmpdir/hostnames", "$user\@$host", $to_hostname) ||
@@ -200 +211 @@
         &ship_configs($host, $user, "$tmpdir/$tb", $proj_dir) || return 0;
         # Now start up
+        print "Swapping $eid in on $tb\n" if $verbose;
         &ssh_cmd($user, $host, "/usr/testbed/bin/swapexp -w $pid $eid in", 
             "swapexp") || return 0;
@@ -220 +232 @@
     my($pid) = $project{$tb};
 
+    print "Stopping $eid on $tb\n" if $verbose;
     &ssh_cmd($user, $host, "/usr/testbed/bin/swapexp -w $pid $eid out", 
         "swapexp (out)") || return 0;
@@ -232 +245 @@
                                     # keep our changes to the parser minimal.
 # Argument processing.
-getopts('c:f:nd', \%opts);
+getopts('c:f:ndv', \%opts);
 $splitter_config = $opts{'c'} || "./splitter.conf";
 $debug = $opts{'d'};
+$verbose = $opts{'v'} || $opts{'d'};
+
 &parse_config("$splitter_config", \%opts) || 
     die "Cannot read config file $splitter_conf: $!\n";
@@ -266 +281 @@
 $tmpdir .= "/split$$";
 
+print "Temp files are in $tmpdir\n" if $verbose;
 # Create a workspace
 unless (-d "$tmpdir") {
@@ -410 +426 @@
         $ddomain = ".$eid.$project{$dtb}$ddomain";
 
+        my($conf_file) = "$myname$sdomain.gw.conf";
+        # translate to lower case so the `hostname` hack for specifying
+        # configuration files works.
+        $conf_file =~ tr/A-Z/a-z/;
+
         # If either end of this link is in the master side of the testbed, that
         # side is the active end. Otherwise the first testbed encountered in
@@ -424 +445 @@
 
         # Write out the file
-        $gwconfig= new IO::File(">$tmpdir/$gateways/$myname$sdomain.gw.conf")|| 
-            die "can't open $tmpdir/$gateways/$myname$sdomain.gw.conf: $!\n";
+        $gwconfig= new IO::File(">$tmpdir/$gateways/$conf_file")|| 
+            die "can't open $tmpdir/$gateways/$conf_file: $!\n";
 
         print $gwconfig "Active: $active\n";
@@ -521 +542 @@
 }
 print "Experiment started\n";
+print "Deleting $tmpdir (-d to leave them in place)\n" if $verbose && !$debug;
 system("rm -rf $tmpdir") unless $debug;
 exit(0);    # set the exit value