Changeset 43048 for branches/eam_branches/ipp-pstamp-20260421/pstamp/scripts/pstamp_queue_requests.pl

Timestamp:

Jun 1, 2026, 4:53:16 PM (7 weeks ago)

Author:

eugene

Message:

working on modernizing the error_code trapping

File:

• branches/eam_branches/ipp-pstamp-20260421/pstamp/scripts/pstamp_queue_requests.pl (modified) (7 diffs)

branches/eam_branches/ipp-pstamp-20260421/pstamp/scripts/pstamp_queue_requests.pl

@@ -11 +11 @@
 
 use Getopt::Long qw( GetOptions );
+use Scalar::Util qw(looks_like_number);
 
 use Sys::Hostname;
@@ -77 +78 @@
     $command .= " -dbserver $dbserver" if $dbserver;
 
-    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+    my ( $success, $error_msg, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => $verbose);
+    my $error_code = &parse_error_message ($success, $error_msg, $command);
     unless ($success) {
-        my $rc = $error_code >> 8;
+        my $rc = $error_code;
         die("Unable to perform pstamptool -datastore: $rc");
     }
@@ -121 +123 @@
         $command .= " --timeout $timeout";
 
-        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+        my ( $success, $error_msg, $full_buf, $stdout_buf, $stderr_buf ) =
             run(command => $command, verbose => $verbose);
+        my $error_code = &parse_error_message ($success, $error_msg, $command);
         unless ($success) {
             # dsproductls exit status is the http error code - 300
-            my $exit_status = $error_code >> 8;
+            my $exit_status = $error_code;
 
             # don't die on "common faults"
@@ -167 +170 @@
         {
             my $command = "$dsfilesetls --uri $uri";
-            my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            my ( $success, $error_msg, $full_buf, $stdout_buf, $stderr_buf ) =
                     run(command => $command, verbose => $verbose);
+            my $error_code = &parse_error_message ($success, $error_msg, $command);
             unless ($success) {
                 # we don't want to die here. We need to set lastFileset
@@ -197 +201 @@
                 $command .= " -dbserver $dbserver" if $dbserver;
 
-                my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+                my ( $success, $error_msg, $full_buf, $stdout_buf, $stderr_buf ) =
                         run(command => $command, verbose => $verbose);
+                my $error_code = &parse_error_message ($success, $error_msg, $command);
 
                 unless ($success) {
@@ -208 +213 @@
 
         {
-        ## now update the last_fileset column in pstampDataStore
-        my $command = "$pstamptool -ds_id $ds_id -moddatastore -set_last_fileset $lastFileset";
-        $command .= " -dbname $dbname" if $dbname;
-        $command .= " -dbserver $dbserver" if $dbserver;
-        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-            run(command => $command, verbose => $verbose);
-            unless ($success) {
-                die("Unable to perform pstamptool -moddatastore: $error_code");
-            }
+            ## now update the last_fileset column in pstampDataStore
+            my $command = "$pstamptool -ds_id $ds_id -moddatastore -set_last_fileset $lastFileset";
+            $command .= " -dbname $dbname" if $dbname;
+            $command .= " -dbserver $dbserver" if $dbserver;
+            my ( $success, $error_msg, $full_buf, $stdout_buf, $stderr_buf ) =
+                run(command => $command, verbose => $verbose);
+            my $error_code = &parse_error_message ($success, $error_msg, $command);
+            unless ($success) {
+                die("Unable to perform pstamptool -moddatastore: $error_code");
+            }
         }
         last if ($numFilesets >= $limit);
@@ -232 +238 @@
                 $command .= " -dbname $dbname" if $dbname;
                 $command .= " -dbserver $dbserver" if $dbserver;
-    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+    my ( $success, $error_msg, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => $verbose);
+    my $error_code = &parse_error_message ($success, $error_msg, $command);
     unless ($success) {
         die("Unable to perform pstamptool -moddatastore: $error_code");
     }
 }
+
+# if the program exited normally, the exit value is returned
+# if the program exited with a signal (abort, crash, etc), PS_EXIT_PROG_ERROR (4) is returned
+# if the program failed to run, -PS_EXIT_PROG_ERROR (-4) is returned
+sub parse_error_message {
+    my $success = shift;
+    my $error_msg = shift;
+    my $command = shift;
+
+    if ($success) { return 0; }
+
+    print "raw error_msg: $error_msg\n";
+    print "full command: $command\n";
+
+    if (&looks_like_number($error_msg)) { return (($error_msg >> 8) or ($PS_EXIT_PROG_ERROR)); }
+        
+    # which of these match?
+    my ($error_code) = $error_msg =~ m/exited with value (\d+)/;
+    if (defined $error_code) { return $error_code; }
+    
+    ($error_code) = $error_msg =~ m/died with signal (\d+)/;
+#   if (defined $error_code) { return (128 + $error_code); }
+    if (defined $error_code) { return ($PS_EXIT_PROG_ERROR); }
+    
+    # probably failed to execute:
+    return (-1*$PS_EXIT_PROG_ERROR);
+}