Changeset 28 for trunk/gridctl.php

Timestamp:

May 16, 2017, 8:55:58 PM (7 years ago)

Author:

gegorbet

Message:

fixes for alamo-local and airavata EXECUTING status

File:

• trunk/gridctl.php (modified) (6 diffs)

trunk/gridctl.php

@@ -61 +61 @@
          continue;
       }
+   }
+
+   else if ( $me_devel )
+   {  // Local (us3iab/-local) and class_devel:  skip processing
+      continue;
    }
 
@@ -533 +538 @@
       $query   = "UPDATE analysis SET status='RUNNING' WHERE gfacID='$gfacID'";
       $message = "Job status request reports job is RUNNING";
+      break;
+
+    case 'EXECUTING'      :
+      $message = "Job status request reports job is EXECUTING";
       break;
 
@@ -825 +834 @@
 
    $cmd    = "/usr/bin/qstat -a $gfacID 2>&1|tail -n 1";
+//write_log( "$self cmd: $cmd" );
+//write_log( "$self cluster: $cluster" );
+//write_log( "$self gfacID: $gfacID" );
    if ( ! preg_match( "/us3iab/", $cluster ) )
    {
       $system = "$cluster.uthscsa.edu";
       $system = preg_replace( "/\-local/", "", $system );
+//write_log( "$self system: $system" );
       $cmd    = "/usr/bin/ssh -x us3@$system " . $cmd;
+//write_log( "$self  cmd: $cmd" );
    }
 
    $result = exec( $cmd );
+//write_log( "$self  result: $result" );
 
    if ( $result == ""  ||  preg_match( "/^qstat: Unknown/", $result ) )
    {
       write_log( "$self get_local_status: Local job $gfacID unknown" );
-write_log( "$self get_local_status: result=$result" );
+//write_log( "$self get_local_status: result=$result" );
       return 'UNKNOWN';
    }
@@ -852 +867 @@
 
       case "C" :                      // Job has completed
-      case ""  :
         $status = 'COMPLETED';
         break;
@@ -985 +999 @@
       case 'SCHEDULED' :
       case 'submitted' :
+      case 'SUBMITTED' :
       case '' :
          $status      = 'SUBMITTED';
@@ -1101 +1116 @@
       }
 
+      else if ( $status_ex == 'EXECUTING' )
+      {
+         $status    = standard_status( $status_gw );
+write_log( "$loghdr status/_in/_gw/_ex=$status/$status_in/$status_gw/$status_ex" );
+      }
+
       else
       {  // Experiment not COMPLETED/FINISHED/DONE: use experiment status