Changeset 37258

Timestamp:

Aug 13, 2014, 10:33:22 AM (12 years ago)

Author:

bills

Message:

If request_finish.pl is called with an unknown request type, it attempts to stop
the request with error status. However this rarely used path though the code had
two bugs.

1. --dbserver is not passed by pstamp.pro so the script can't update the database
2. the options on the updatereq command were wrong. Need -set_state, -set_fault not -state -fault

File:

• tags/ipp-pv3-20140717/pstamp/scripts/request_finish.pl (modified) (3 diffs)

tags/ipp-pv3-20140717/pstamp/scripts/request_finish.pl

@@ -20 +20 @@
 
 use PS::IPP::Config qw( :standard );
+use PS::IPP::PStamp::RequestFile qw( :standard );
 
 my ( $req_id, $req_name, $req_file, $req_type, $outdir, $product, $dbname, $dbserver, $verbose, $save_temps, $redirect_output );
+
+my $ipprc = PS::IPP::Config->new();
 
 GetOptions(
@@ -57 +60 @@
 if ($redirect_output) {
     my $logDest = "$outdir/reqfinish.$req_id.log";
-    my $ipprc = PS::IPP::Config->new();
     $ipprc->redirect_output($logDest);
+}
+
+if (!$dbserver) {
+    $dbserver =  metadataLookupStr($ipprc->{_siteConfig}, 'PS_DBSERVER');
 }
 
@@ -90 +96 @@
     }
 } else {
-    # Unknown request type.
-    # Since we don't have a req_name there's not much we can do so just the request's state to stop.
+    # Unknown request type. Stop job with fault invalid request.
     print STDERR "request  $req_id has unknown reqType $req_type\n" if $verbose;
-    my $command = "$pstamptool -updatereq -req_id $req_id -state stop -fault $PS_EXIT_DATA_ERROR";
+
+    my $command = "$pstamptool -updatereq -req_id $req_id -set_state stop -set_fault $PSTAMP_INVALID_REQUEST";
     $command   .= " -dbname $dbname" if $dbname;
     $command   .= " -dbserver $dbserver" if $dbserver;