Changeset 23

Timestamp:

Aug 30, 2016, 1:43:46 PM (8 years ago)

Author:

gegorbet

Message:

fix to avoid extra AnalysisResultData in cleanup, lonestar mods to cluster_status

Location:

trunk

Files:

• cleanup.php (modified) (1 diff)
• cleanup_gfac.php (modified) (1 diff)
• cluster_status.php (modified) (4 diffs)

trunk/cleanup.php

@@ -494 +494 @@
       }
 
-      else                                           // It's a model file
+      else if ( preg_match( "/\.model/", $fn ) > 0 ) // It's a model file
       {
          $xml         = file_get_contents( $fn );

trunk/cleanup_gfac.php

@@ -528 +528 @@
       }
 
-      else                                           // It's a model file
+      else if ( preg_match( "/\.model/", $fn ) > 0 ) // It's a model file
       {
          $xml         = file_get_contents( $fn );

trunk/cluster_status.php

@@ -109 +109 @@
    global $gDB;
    global $self;
+//echo  " $cluster $queued, $status, $running\n";
 
    $gfac_link = mysql_connect( $dbhost, $guser, $gpasswd );
@@ -167 +168 @@
    $clusters = array( "alamo", "lonestar5", "stampede",
                       "comet", "gordon", "jureca", "jacinto" );
+//   $clusters = array( "alamo", "lonestar5", "stampede",
+//                      "comet", "gordon", "jureca"            );
    foreach ( $clusters as $clname )
    {
@@ -203 +206 @@
          {
             $host   = "us3@stampede.tacc.utexas.edu";
-            $qstat  = `ssh $host '/usr/local/bin/showq 2>&1|tail -1'`;
+            $qstat  = `ssh $host '/usr/local/bin/showq 2>&1|grep "Total Jobs"'`;
             $sparts = preg_split( '/\s+/', $qstat );
             $tot    = $sparts[ 2 ];
@@ -213 +216 @@
             break;
          }
-         case 'lonestar':
-         {
-            $host   = "us3@lonestar.tacc.utexas.edu";
-            $qstat  = `ssh $host 'showq 2>&1|tail -1'`;
-            $sparts = preg_split( '/\s+/', $qstat );
-            $tot    = $sparts[ 2 ];
-            $run    = '0';
-            $que    = '0';
-            $sta    = "up";
-            if ( $tot == ''  ||  $tot == '0' )
-            {
-               $sta    = "down";
-            }
-            else
-            {
-               $run    = $sparts[ 5 ];
-               $que    = $sparts[ 8 ];
-            }
-            break;
-         }
          case 'lonestar5':
          {
             $host   = "us3@ls5.tacc.utexas.edu";
-            $qstat  = `ssh $host '/usr/local/bin/showq 2>&1|tail -1'`;
+            $qstat  = `ssh $host '/usr/local/bin/showq 2>&1|grep "Total Jobs"'`;
             $sparts = preg_split( '/\s+/', $qstat );
             $tot    = $sparts[ 2 ];