Changeset 32 for trunk

Timestamp:

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

Author:

gegorbet

Message:

gridctl updates, mostly for jetstream and 4.0

Location:

trunk

Files:

• cleanup.php (modified) (1 diff)
• cluster_status.php (modified) (3 diffs)
• gridctl.php (modified) (5 diffs)
• update_notice.php (modified) (1 diff)

trunk/cleanup.php

@@ -888 +888 @@
       if ( $is_jetstr )
       {
-         $clushost = "js-157-184.jetstream-cloud.org";
+         $clushost = "js-169-137.jetstream-cloud.org";
          $lworkdir = "/N/us3_cluster/work/local";
       }

trunk/cluster_status.php

@@ -326 +326 @@
          case 'jetstream':
          {
-            $host   = "us3@js-157-184.jetstream-cloud.org";
-            $qstat  = `ssh $host '/usr/bin/sinfo -s -p batch -o "%a %F" |tail -1'`;
+            $host   = "us3@js-169-137.jetstream-cloud.org";
+//            $qstat  = `ssh $host '/usr/bin/sinfo -s -p batch -o "%a %F" |tail -1'`;
+            $qstat  = `ssh $host '/home/us3/bin/clusstat |tail -n 1'`;
             $sparts = preg_split( '/\s+/', $qstat );
             $sta    = $sparts[ 0 ];
@@ -333 +334 @@
             $sparts = preg_split( '/\//', $knts );
             $run    = $sparts[ 0 ];
-            $que    = $sparts[ 1 ];
+            $que    = $sparts[ 2 ];
+            $tot    = $sparts[ 3 ];
             if ( $sta == "" )
                $sta    = "down";
@@ -353 +355 @@
       $a[ 'running' ] = $run;
       $a[ 'status'  ] = $sta;
-//echo "$self:  $clname  $que $run $sta\n";
+echo "$self:  $clname  $que $run $sta\n";
 
       $data[] = $a;

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;
 

trunk/update_notice.php

@@ -6 +6 @@
 
 // Get the US3 system release of latest file on download site
-$s_cmd1 = "ssh us3@ultrascan.uthscsa.edu 'ls -t /srv/www/htdocs/ultrascan3/software/*3.5*";
+$s_cmd1 = "ssh us3@ultrascan.uthscsa.edu 'ls -t /srv/www/htdocs/ultrascan3/software/*4.0*";
 $s_cmd1 = "$s_cmd1 | sed -n 1p | sed -e s@^.*3.5@3.5@ | cut -d. -f1-3 | sed -e s@\-setup@@" . "'";
 $s_cmd2 = exec( $s_cmd1 );