Changeset 42602 for branches/eam_branches/ipp-20230313/ippScripts/scripts/xcstack_skycell.pl

Timestamp:

Jan 28, 2024, 2:24:07 PM (2 years ago)

Author:

eugene

Message:

fixes to get xcstack and related scripts working

File:

• branches/eam_branches/ipp-20230313/ippScripts/scripts/xcstack_skycell.pl (modified) (6 diffs)

branches/eam_branches/ipp-20230313/ippScripts/scripts/xcstack_skycell.pl

@@ -19 +19 @@
 
 use IPC::Cmd 0.36 qw( can_run run );
+use Scalar::Util qw(looks_like_number);
 use PS::IPP::Metadata::Config;
 use PS::IPP::Metadata::List qw( parse_md_list );
@@ -244 +245 @@
 
     # cannot use run_command here (no metadata output to parse)
-    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => $verbose);
+    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) {
-        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        &my_die("Unable to perform ppStack: $error_code", $xcstack_id, $error_code);
+        &my_die("Unable to perform $command: $error_msg", $xcstack_id, $error_code);
     }
 
@@ -259 +259 @@
         # measure stats
         $command = "$ppStatsFromMetadata $outputStatsReal - XCSTACK_SKYCELL";
-        ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = run(command => $command, verbose => $verbose);
+        ( $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) {
-            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-            &my_die("Unable to perform ppStatsFromMetadata: $error_code", $xcstack_id, $error_code);
+            &my_die("Unable to perform $command: $error_msg", $xcstack_id, $error_code);
         }
         foreach my $line (@$stdout_buf) { $cmdflags .= " $line"; }
@@ -295 +295 @@
         $command .= " -dbname $dbname" if defined $dbname;
 
-        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-            run(command => $command, verbose => $verbose);
+        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) {
-            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-            &my_die("Unable to perform xcstacktool $mode $error_code", $xcstack_id, $error_code);
+            &my_die("Unable to perform $command: $error_msg", $xcstack_id, $error_code);
         }
     }
-
 }
 
 print "I've updated the database: $xcstack_id\n";
-
 print "I've reached the end of processing with a code of $?: $xcstack_id\n";
 
@@ -411 +408 @@
     my $mdcParser = PS::IPP::Metadata::Config->new; # Parser for metadata config files
 
-    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = run(command => $command, verbose => $verbose);
+    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) {
-        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        &my_die("Unable to perform $command", $xcstack_id, $error_code);
+        &my_die("Unable to perform $command: $error_msg", $xcstack_id, $error_code);
     }
 
@@ -435 +432 @@
 }
 
+# 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);
+}
+
 __END__