Changeset 26049

Timestamp:

Nov 6, 2009, 9:54:56 AM (17 years ago)

Author:

bills

Message:

set outdir for faulted distComponents so that we can find what host the log file is on.

File:

• trunk/ippScripts/scripts/dist_component.pl (modified) (5 diffs)

trunk/ippScripts/scripts/dist_component.pl

@@ -106 +106 @@
     unless ($success) {
         $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        &my_die("Unable to perform $command: $error_code", $dist_id, $component, $error_code);
+        &my_die("Unable to perform $command: $error_code", $dist_id, $component, $outdir, $error_code);
     }
 
-    open $rf, "<$rf_name" or &my_die("failed to open results file $rf_name", $dist_id, $component, $PS_EXIT_UNKNOWN_ERROR);
+    open $rf, "<$rf_name" or &my_die("failed to open results file $rf_name", $dist_id, $component, $outdir, $PS_EXIT_UNKNOWN_ERROR);
 
     my @lines = (<$rf>);
 
     my $metadata = $mdcParser->parse (join "", @lines) or
-        &my_die("Unable to parse metadata config doc", $dist_id, $component, $PS_EXIT_PROG_ERROR);
+        &my_die("Unable to parse metadata config doc", $dist_id, $component, $outdir, $PS_EXIT_PROG_ERROR);
 
     my $results = parse_md_list($metadata);
@@ -120 +120 @@
     if ((scalar @$results) != 1) {
         my $n = scalar @$results;
-        &my_die("Unexected number of results from dist_make_bundle.pl: $n", $dist_id, $component, $PS_EXIT_PROG_ERROR);
+        &my_die("Unexected number of results from dist_make_bundle.pl: $n", $dist_id, $component, $outdir, $PS_EXIT_PROG_ERROR);
     }
     my $result = $results->[0];
 
     $file_name = $result->{name};
-    &my_die("undefined file name from dist_bundle.pl", $dist_id, $component, $PS_EXIT_PROG_ERROR) unless defined $file_name;
+    &my_die("undefined file name from dist_bundle.pl", $dist_id, $component, $outdir, $PS_EXIT_PROG_ERROR) unless defined $file_name;
 
     $bytes = $result->{bytes};
-    &my_die("undefined file size from dist_bundle.pl", $dist_id, $component, $PS_EXIT_PROG_ERROR) unless defined $bytes;
+    &my_die("undefined file size from dist_bundle.pl", $dist_id, $component, $outdir, $PS_EXIT_PROG_ERROR) unless defined $bytes;
 
     $md5sum = $result->{md5sum};
-    &my_die("undefined file md5sum from dist_bundle.pl", $dist_id, $component, $PS_EXIT_PROG_ERROR) unless defined $md5sum;
+    &my_die("undefined file md5sum from dist_bundle.pl", $dist_id, $component, $outdir, $PS_EXIT_PROG_ERROR) unless defined $md5sum;
 }
 
@@ -144 +144 @@
         unless ($success) {
             $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-            &my_die("Unable to perform $command: $error_code", $dist_id, $component, $error_code);
+            &my_die("Unable to perform $command: $error_code", $dist_id, $component, $outdir, $error_code);
         }
     } else {
@@ -159 +159 @@
     my $dist_id = shift;        # distRun.dist_id
     my $component = shift;      # class_id, skycell_id, or exposure
+    my $outdir = shift;         # output directory
     my $exit_code = shift;      # Exit code to add
 
@@ -166 +167 @@
     $command   .= " -dist_id $dist_id";
     $command   .= " -component $component";
+    $command   .= " -outdir $outdir";
     $command   .= " -fault $exit_code";
     $command   .= " -dbname $dbname" if defined $dbname;