Changeset 15


Ignore:
Timestamp:
Aug 31, 2015, 8:08:16 PM (9 years ago)
Author:
gegorbet
Message:

fixes, mainly for Jureca

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/cluster_status.php

    r14 r15  
    165165   global $data;
    166166
    167 //   $clusters = array( "alamo", "jacinto" );
    168    $clusters = array( "alamo", "lonestar", "stampede", "comet", "gordon", "juropa" );
    169    //$clusters = array( "alamo", "lonestar", "stampede", "comet", "gordon", "jureca" );
    170 //   $clusters = array( "alamo" );
     167   //$clusters = array( "alamo", "lonestar", "stampede", "comet", "gordon" );
     168   $clusters = array( "alamo", "lonestar", "stampede", "comet", "gordon", "jureca" );
    171169   foreach ( $clusters as $clname )
    172170   {
     
    224222         {
    225223            $host   = "us3@comet.sdsc.edu";
    226             $qstat  = `ssh $host '/usr/bin/sinfo -s -p compute -o "%a %F" 2>&1|tail -1'`;
     224            $qstat  = `ssh $host '/usr/bin/sinfo -s -p compute -o "%a %F" |tail -1'`;
    227225            $sparts = preg_split( '/\s+/', $qstat );
    228226            $sta    = $sparts[ 0 ];
     
    231229            $run    = $sparts[ 0 ];
    232230            $que    = $sparts[ 1 ];
     231            if ( $sta == "" )
     232               $sta    = "down";
    233233            break;
    234234         }
     
    247247            break;
    248248         }
    249          case 'juropa':
    250          {
    251             $host   = "zdv575@juropa.fz-juelich.de";
    252             $qstat  = `ssh $host '/usr/bin/qstat -B 2>&1|tail -1'`;
    253             $sparts = preg_split( '/\s+/', $qstat );
    254             $que    = $sparts[ 3 ];
    255             $run    = $sparts[ 4 ];
    256             $sta    = $sparts[ 9 ];
    257             if ( $sta == "Active" )
    258                $sta    = "up";
    259             else if ( $sta == "Scheduling" )
    260                $sta    = "up";
    261             else
    262                $sta    = "down";
    263             break;
    264          }
    265249         case 'jureca':
    266250         {
    267             //$host   = "swus1@jureca.fz-juelich.de";
    268             $host   = "swus1@juropatest2.fz-juelich.de";
     251            $host   = "swus1@jureca.fz-juelich.de";
    269252            $qstat  = `ssh $host '/usr/bin/sinfo -s -p batch -o "%a %F" 2>&1|tail -1'`;
    270253            $sparts = preg_split( '/\s+/', $qstat );
  • trunk/gridctl.php

    r14 r15  
    659659   global $cluster;
    660660
    661    if ( preg_match( "/US3-A/i", $gfacID )  &&
    662         ! preg_match( "/jur/i", $cluster ) )
     661   if ( preg_match( "/US3-A/i", $gfacID ) )
    663662   {
    664663      // Then it's an Airavata/Thrift job
     
    10871086      }
    10881087
     1088if(preg_match("/US3-A/i",$gfacID))
    10891089//if(preg_match("/US3-ADEV/i",$gfacID))
    1090 if(preg_match("/US3-A/i",$gfacID))
    10911090write_log( "$loghdr status/_in/_gw/_ex=$status/$status_in/$status_gw/$status_ex" );
    10921091//write_log( "$loghdr status/_in/_gw/_ex=$status/$status_in/$status_gw/$status_ex" );
  • trunk/runID_info.php

    r7 r15  
    730730  global $uses_airavata;
    731731
    732   if ( $uses_airavata === true && $cluster != 'juropa.fz-juelich.de' )
     732  if ( $uses_airavata === true )
    733733  {
    734734    $row['gfacStatus'] = nl2br( getExperimentStatus( $row['gfacID'] ) );
Note: See TracChangeset for help on using the changeset viewer.