Changeset ad5639c for fedkit

Timestamp:

May 18, 2008 1:17:57 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:

bd6e48a

Parents:

387408b

Message:

retry with different credentials on failure

File:

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

fedkit/splitter.pl

@@ -457 +457 @@
 }
 
+# Fill tbparams with results from the fedd call.  The command is passed in and
+# a string with any relevant error conditions is returned.  undef is success.
+sub fedd_access_request{
+    my($cmd) = @_;
+    my($rv)=undef;
+
+    system("$cmd 2> /tmp/splitter.err.$$ > /tmp/splitter.$$" );
+
+    if ( ! $? ) {
+        print "Parsing /tmp/splitter.$$\n";
+        &parse_testbeds_filename("/tmp/splitter.$$", $tbparams) ||
+            ($rv =  "Error reading fedd output: $!\n");
+    }
+    else {
+        my $f = new IO::File("/tmp/splitter.err.$$");
+        $rv =  "Fedd_client error:\n";
+        while (<$f>) { $rv .= $_; }
+        $f->close();
+    }
+    unlink("/tmp/splitter.$$", "/tmp/splitter.err.$$");
+    return $rv;
+}
 
 $pid = $gid = "dummy";              # Default project and group to pass to
@@ -575 +597 @@
         my @nodes;      # Current testbed node requests
 
+        # The Allbeds line has the testbed name first separated by the node
+        # requirements of the testbeds.  A node requirement is separated form
+        # teh testbed name and other node requirements by a vertical bar (|).
+        # This pulls the testbed off the front (which must be present) and
+        # splits the node descriptors out by the vertical bar.  The first
+        # vertical bar (the one after the testbed) is removed by the intial
+        # regular expression to avoid a null entry in @nodes.  The node
+        # requests are of the form image:type:count and can be passed directly
+        # to fedd_client as parameters.
         /([^|]+)\|?(.*)/ && do {
-            my $n;
+            my $n;      # Scratch
 
             ($tb , $n) = ($1, $2);
@@ -588 +619 @@
                 die "Can't open pipe to fedd:$!\n";
             my $proj = $auth_proj ? " -p $auth_proj " : "";
+            my @cmds;
+            my $rv;
 
             print("Checking access to $tb using " . $tbparams->{$tb}->{'uri'}
                 . "\n") if $verbose;
 
-            my $cmd = "$fedd_client -t " . 
+            # First access command, implicitly uses localhost fedd
+            push(@cmds,"$fedd_client -t " . 
                 $tbparams->{$tb}->{'uri'} .  " -T $ENV{HOME}/cacert.pem ".
                 "-l $tb $proj" . (@nodes ? " -n " : " ") .
-                join(" -n ", @nodes) . "| /usr/bin/tee fedd.$tb ";
-            print "$cmd\n" if $verbose;
-
-            $access_pipe->reader($cmd) || 
-                    die "Can't exec fedd_client: $!\n";
-
-            &parse_testbeds($access_pipe, $tbparams) || 
-                warn("Error reading fedd output: $!\n");
-            $access_pipe->close();
+                join(" -n ", @nodes));
+            # Second try access command, implicitly directly contact testbed
+            push(@cmds,"$fedd_client -t " . 
+                $tbparams->{$tb}->{'uri'} .  " -u " .
+                $tbparams->{$tb}->{'uri'} .  " -T $ENV{HOME}/cacert.pem ".
+                "-l $tb $proj" . (@nodes ? " -n " : " ") .
+                join(" -n ", @nodes));
+
+            foreach my $c (@cmds) {
+                print "$c\n" if $verbose;
+                $rv = &fedd_access_request($c);
+                warn($rv) if $rv;
+
+                last if $rv eq undef;
+            }
+            die "Cannot get access to $tb\n"  if $rv;
         }
         next;