Changeset 32 for trunk


Ignore:
Timestamp:
Dec 16, 2017, 5:50:01 PM (7 years ago)
Author:
gegorbet
Message:

gridctl updates, mostly for jetstream and 4.0

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/cleanup.php

    r31 r32  
    888888      if ( $is_jetstr )
    889889      {
    890          $clushost = "js-157-184.jetstream-cloud.org";
     890         $clushost = "js-169-137.jetstream-cloud.org";
    891891         $lworkdir = "/N/us3_cluster/work/local";
    892892      }
  • trunk/cluster_status.php

    r31 r32  
    326326         case 'jetstream':
    327327         {
    328             $host   = "us3@js-157-184.jetstream-cloud.org";
    329             $qstat  = `ssh $host '/usr/bin/sinfo -s -p batch -o "%a %F" |tail -1'`;
     328            $host   = "us3@js-169-137.jetstream-cloud.org";
     329//            $qstat  = `ssh $host '/usr/bin/sinfo -s -p batch -o "%a %F" |tail -1'`;
     330            $qstat  = `ssh $host '/home/us3/bin/clusstat |tail -n 1'`;
    330331            $sparts = preg_split( '/\s+/', $qstat );
    331332            $sta    = $sparts[ 0 ];
     
    333334            $sparts = preg_split( '/\//', $knts );
    334335            $run    = $sparts[ 0 ];
    335             $que    = $sparts[ 1 ];
     336            $que    = $sparts[ 2 ];
     337            $tot    = $sparts[ 3 ];
    336338            if ( $sta == "" )
    337339               $sta    = "down";
     
    353355      $a[ 'running' ] = $run;
    354356      $a[ 'status'  ] = $sta;
    355 //echo "$self:  $clname  $que $run $sta\n";
     357echo "$self:  $clname  $que $run $sta\n";
    356358
    357359      $data[] = $a;
  • trunk/gridctl.php

    r31 r32  
    839839   $is_jetstr = preg_match( "/jetstream/", $cluster );
    840840   if ( $is_jetstr )
    841       $cmd    = "squeue -a $gfacID 2>&1|tail -n 1";
     841      $cmd    = "squeue -j $gfacID 2>&1|tail -n 1";
    842842   else
    843843      $cmd    = "/usr/bin/qstat -a $gfacID 2>&1|tail -n 1";
     
    871871   }
    872872///////////////////////////////////////////////////////////////////
    873    if ( $result == ""  ||
    874         preg_match( "/^qstat: Unknown/", $result )  ||
     873//   if ( $result == ""  ||
     874//        preg_match( "/^qstat: Unknown/", $result )  ||
     875//        preg_match( "/ssh_exchange_id/", $result ) )
     876   if ( preg_match( "/^qstat: Unknown/", $result )  ||
    875877        preg_match( "/ssh_exchange_id/", $result ) )
    876878   {
     
    881883
    882884   $values = preg_split( "/\s+/", $result );
    883    $jstat   = ( $is_jetstr == 0 ) ? $values[ 9 ] : $values[ 4 ];
     885   $jstat   = ( $is_jetstr == 0 ) ? $values[ 9 ] : $values[ 5 ];
    884886//write_log( "$self: get_local_status: job status = /$jstat/");
    885887   switch ( $jstat )
     
    888890      case "E" :                      // Job is exiting after having run
    889891      case "R" :                      // Still running
     892      case "CG" :                     // Job is completing
    890893        $status = 'ACTIVE';
    891894        break;
    892895
    893896      case "C" :                      // Job has completed
     897      case "ST" :                     // Job has disappeared
     898      case "CD" :                     // Job has completed
    894899        $status = 'COMPLETED';
    895900        break;
     
    899904      case "Q" :                      // Queued
    900905      case "PD" :                     // Queued
     906      case "CF" :                     // Queued
    901907        $status = 'SUBMITTED';
     908        break;
     909
     910      case "CA" :                     // Job has been canceled
     911        $status = 'CANCELED';
     912        break;
     913
     914      case "F"  :                     // Job has failed
     915      case "BF" :                     // Job has failed
     916      case "NF" :                     // Job has failed
     917      case "TO" :                     // Job has timed out
     918      case ""   :                     // Job has disappeared
     919        $status = 'FAILED';
    902920        break;
    903921
  • trunk/update_notice.php

    r30 r32  
    66
    77// Get the US3 system release of latest file on download site
    8 $s_cmd1 = "ssh us3@ultrascan.uthscsa.edu 'ls -t /srv/www/htdocs/ultrascan3/software/*3.5*";
     8$s_cmd1 = "ssh us3@ultrascan.uthscsa.edu 'ls -t /srv/www/htdocs/ultrascan3/software/*4.0*";
    99$s_cmd1 = "$s_cmd1 | sed -n 1p | sed -e s@^.*3.5@3.5@ | cut -d. -f1-3 | sed -e s@\-setup@@" . "'";
    1010$s_cmd2 = exec( $s_cmd1 );
Note: See TracChangeset for help on using the changeset viewer.