Changeset 15 for trunk

Timestamp:

Aug 31, 2015, 8:08:16 PM (9 years ago)

Author:

gegorbet

Message:

fixes, mainly for Jureca

Location:

trunk

Files:

• cluster_status.php (modified) (4 diffs)
• gridctl.php (modified) (2 diffs)
• runID_info.php (modified) (1 diff)

trunk/cluster_status.php

@@ -165 +165 @@
    global $data;
 
-//   $clusters = array( "alamo", "jacinto" );
-   $clusters = array( "alamo", "lonestar", "stampede", "comet", "gordon", "juropa" );
-   //$clusters = array( "alamo", "lonestar", "stampede", "comet", "gordon", "jureca" );
-//   $clusters = array( "alamo" );
+   //$clusters = array( "alamo", "lonestar", "stampede", "comet", "gordon" );
+   $clusters = array( "alamo", "lonestar", "stampede", "comet", "gordon", "jureca" );
    foreach ( $clusters as $clname )
    {
@@ -224 +222 @@
          {
             $host   = "us3@comet.sdsc.edu";
-            $qstat  = `ssh $host '/usr/bin/sinfo -s -p compute -o "%a %F" 2>&1|tail -1'`;
+            $qstat  = `ssh $host '/usr/bin/sinfo -s -p compute -o "%a %F" |tail -1'`;
             $sparts = preg_split( '/\s+/', $qstat );
             $sta    = $sparts[ 0 ];
@@ -231 +229 @@
             $run    = $sparts[ 0 ];
             $que    = $sparts[ 1 ];
+            if ( $sta == "" )
+               $sta    = "down";
             break;
          }
@@ -247 +247 @@
             break;
          }
-         case 'juropa':
-         {
-            $host   = "zdv575@juropa.fz-juelich.de";
-            $qstat  = `ssh $host '/usr/bin/qstat -B 2>&1|tail -1'`;
-            $sparts = preg_split( '/\s+/', $qstat );
-            $que    = $sparts[ 3 ];
-            $run    = $sparts[ 4 ];
-            $sta    = $sparts[ 9 ];
-            if ( $sta == "Active" )
-               $sta    = "up";
-            else if ( $sta == "Scheduling" )
-               $sta    = "up";
-            else
-               $sta    = "down";
-            break;
-         }
          case 'jureca':
          {
-            //$host   = "swus1@jureca.fz-juelich.de";
-            $host   = "swus1@juropatest2.fz-juelich.de";
+            $host   = "swus1@jureca.fz-juelich.de";
             $qstat  = `ssh $host '/usr/bin/sinfo -s -p batch -o "%a %F" 2>&1|tail -1'`;
             $sparts = preg_split( '/\s+/', $qstat );

trunk/gridctl.php

@@ -659 +659 @@
    global $cluster;
 
-   if ( preg_match( "/US3-A/i", $gfacID )  &&
-        ! preg_match( "/jur/i", $cluster ) )
+   if ( preg_match( "/US3-A/i", $gfacID ) )
    {
       // Then it's an Airavata/Thrift job
@@ -1087 +1086 @@
       }
 
+if(preg_match("/US3-A/i",$gfacID))
 //if(preg_match("/US3-ADEV/i",$gfacID))
-if(preg_match("/US3-A/i",$gfacID))
 write_log( "$loghdr status/_in/_gw/_ex=$status/$status_in/$status_gw/$status_ex" );
 //write_log( "$loghdr status/_in/_gw/_ex=$status/$status_in/$status_gw/$status_ex" );

trunk/runID_info.php

@@ -730 +730 @@
   global $uses_airavata;
 
-  if ( $uses_airavata === true && $cluster != 'juropa.fz-juelich.de' )
+  if ( $uses_airavata === true )
   {
     $row['gfacStatus'] = nl2br( getExperimentStatus( $row['gfacID'] ) );