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

Timestamp:

Jun 12, 2026, 2:47:49 PM (5 weeks ago)

Author:

eugene

Message:

convert the IPC::Cmd run calls to ps_run to handle inconsistent behavior between IPC:Cmd versions pre- and post-0.40

File:

• branches/eam_branches/ipp-pstamp-20260421/pstamp/scripts/pstamp_queue_requests.pl (modified) (9 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;
@@ -35 +34 @@
 }
 
-use IPC::Cmd 0.36 qw( can_run run );
+use IPC::Cmd 0.36 qw( can_run );
 
 use PS::IPP::Metadata::Config;
@@ -51 +50 @@
                        metadataLookupBool
                        caturi
+                       ps_run
                        );
 
@@ -78 +78 @@
     $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);
+    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+        ps_run(command => $command, verbose => $verbose);
     unless ($success) {
-        my $rc = $error_code;
+        my $rc = ($error_code >> 8);
         die("Unable to perform pstamptool -datastore: $rc");
     }
@@ -123 +122 @@
         $command .= " --timeout $timeout";
 
-        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);
+        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            ps_run(command => $command, verbose => $verbose);
         unless ($success) {
             # dsproductls exit status is the http error code - 300
-            my $exit_status = $error_code;
+            my $exit_status = ($error_code >> 8);
 
             # don't die on "common faults"
@@ -170 +168 @@
         {
             my $command = "$dsfilesetls --uri $uri";
-            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);
+            my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+                    ps_run(command => $command, verbose => $verbose);
             unless ($success) {
                 # we don't want to die here. We need to set lastFileset
@@ -201 +198 @@
                 $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);
+                my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+                        ps_run(command => $command, verbose => $verbose);
 
                 unless ($success) {
@@ -217 +213 @@
             $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);
+            my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+                ps_run(command => $command, verbose => $verbose);
             unless ($success) {
                 die("Unable to perform pstamptool -moddatastore: $error_code");
@@ -238 +233 @@
                 $command .= " -dbname $dbname" if $dbname;
                 $command .= " -dbserver $dbserver" if $dbserver;
-    my ( $success, $error_msg, $full_buf, $stdout_buf, $stderr_buf ) =
+    my ( $success, $error_code, $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);
-}