Changeset 32 for trunk/gridctl.php

Timestamp:

Dec 16, 2017, 5:50:01 PM (6 years ago)

Author:

gegorbet

Message:

gridctl updates, mostly for jetstream and 4.0

File:

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

trunk/gridctl.php

@@ -839 +839 @@
    $is_jetstr = preg_match( "/jetstream/", $cluster );
    if ( $is_jetstr )
-      $cmd    = "squeue -a $gfacID 2>&1|tail -n 1";
+      $cmd    = "squeue -j $gfacID 2>&1|tail -n 1";
    else
       $cmd    = "/usr/bin/qstat -a $gfacID 2>&1|tail -n 1";
@@ -871 +871 @@
    }
 ///////////////////////////////////////////////////////////////////
-   if ( $result == ""  ||
-        preg_match( "/^qstat: Unknown/", $result )  ||
+//   if ( $result == ""  ||
+//        preg_match( "/^qstat: Unknown/", $result )  ||
+//        preg_match( "/ssh_exchange_id/", $result ) )
+   if ( preg_match( "/^qstat: Unknown/", $result )  ||
         preg_match( "/ssh_exchange_id/", $result ) )
    {
@@ -881 +883 @@
 
    $values = preg_split( "/\s+/", $result );
-   $jstat   = ( $is_jetstr == 0 ) ? $values[ 9 ] : $values[ 4 ];
+   $jstat   = ( $is_jetstr == 0 ) ? $values[ 9 ] : $values[ 5 ];
 //write_log( "$self: get_local_status: job status = /$jstat/");
    switch ( $jstat )
@@ -888 +890 @@
       case "E" :                      // Job is exiting after having run
       case "R" :                      // Still running
+      case "CG" :                     // Job is completing
         $status = 'ACTIVE';
         break;
 
       case "C" :                      // Job has completed
+      case "ST" :                     // Job has disappeared
+      case "CD" :                     // Job has completed
         $status = 'COMPLETED';
         break;
@@ -899 +904 @@
       case "Q" :                      // Queued
       case "PD" :                     // Queued
+      case "CF" :                     // Queued
         $status = 'SUBMITTED';
+        break;
+
+      case "CA" :                     // Job has been canceled
+        $status = 'CANCELED';
+        break;
+
+      case "F"  :                     // Job has failed
+      case "BF" :                     // Job has failed
+      case "NF" :                     // Job has failed
+      case "TO" :                     // Job has timed out
+      case ""   :                     // Job has disappeared
+        $status = 'FAILED';
         break;