Changeset 41584

Timestamp:

May 15, 2021, 8:41:21 AM (5 years ago)

Author:

eugene

Message:

import modifications from ippitc

Location:

trunk/pstamp/scripts

Files:

• dquery_job_run.pl (modified) (2 diffs)
• dqueryparse.pl (modified) (2 diffs)
• pstamp_job_run.pl (modified) (1 diff)
• pstamp_server_status (modified) (1 diff)

trunk/pstamp/scripts/dquery_job_run.pl

@@ -121 +121 @@
 my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
     run(command => $command, verbose => $verbose);
+## MEH need to adjust error_code to rc
 unless ($success) {
     my $rc = $error_code >> 8;
@@ -388 +389 @@
     $exit_code = $PS_EXIT_PROG_ERROR unless defined $exit_code;
 
-    carp("$message : $QUERY_ID $FPA_ID $MJD_OBS $FILTER $OBSCODE $STAGE");
+    #carp("$message : $QUERY_ID $FPA_ID $MJD_OBS $FILTER $OBSCODE $STAGE");
+    carp("$message : $QUERY_ID $FPA_ID $MJD_OBS $FILTER $OBSCODE $STAGE $exit_code");
+
     exit($exit_code);
 

trunk/pstamp/scripts/dqueryparse.pl

@@ -385 +385 @@
                     ($query{$fpa_id}{STATE}[$valid_index] eq 'drop') or 
                     ($query{$fpa_id}{STATE}[$valid_index] eq 'error_cleaned') or 
-                    ($query{$fpa_id}{DATA_STATE}[$valid_index] eq 'error_cleaned') or
+                    ($query{$fpa_id}{DATA_STATE}[$valid_index] eq 'error_cleaned') or
                     ($query{$fpa_id}{STATE}[$valid_index] eq 'goto_scrubbed') or 
                     ($query{$fpa_id}{DATA_STATE}[$valid_index] eq 'scrubbed')) {
@@ -391 +391 @@
                     # image is gone and it's not coming back
                     $query{$fpa_id}{FAULT}[$valid_index] = $PSTAMP_GONE;
-                    ## MEH error_cleaned isn't necessarily gone though
-                    ## if BAD_COMPONENT not set then doesn't get added to faulted_rows list (others need this too?)
-                    $query{$fpa_id}{BAD_COMPONENT}[$valid_index] = 1;
+                    ## MEH why was this missing? should be added to other FAULT cases...
+                    ## messes with row order, skipping the faulted rows on output, unclear if problem since happens in other cases too 
+                    $query{$fpa_id}{BAD_COMPONENT}[$valid_index] = 1;
                 }
                 elsif ($need_magic and ($query{$fpa_id}{MAGICKED}[$valid_index] eq 0)) {

trunk/pstamp/scripts/pstamp_job_run.pl

@@ -611 +611 @@
                     print STDERR "file $f is not available\n";
                     $return_code = 0;
-                    ## MEH doesn't look like return_code is even used from check_files...
-                    ## if file is not available, why is my_die not called with PSTAMP_NOT_AVAILABLE?
-                    ## is this only the case when neb-host down and fails to wait for fix?
-                    ## with multiple data nodes down, this needs to be a fault case
-                    my_die( "file $f is not available:", $job_id, $error_code, 'stop');
+                    ## MEH 20210127 doesn't look like return_code is even used from check_files...
+                    ## if file is not available, why is my_die not called with PSTAMP_NOT_AVAILABLE?
+                    ## is this only the case when neb-host down and fails to wait for fix?
+                    ## with multiple data nodes down, this needs to be a fault case
+                    my_die( "file $f is not available:", $job_id, $error_code, 'stop'); 
                 }
             } else {

trunk/pstamp/scripts/pstamp_server_status

@@ -124 +124 @@
         if ($controller_state) {
             print $br . "Pantasks Controller $controller_state.\n";
-            # loading active labels
-            my $runlabels = `echo \"show.labels; quit\" \| pantasks_client -c ~ippitc/pstamp/ptolemy.rc \| tail -n +7`;
-            print $br."current labels: \n".$runlabels."\n";
         } else {
             print STDERR "Controller state not found";