Changeset 41 for trunk

Timestamp:

May 10, 2019, 1:45:46 PM (6 years ago)

Author:

gegorbet

Message:

gridctl mods for uslims.uleth.ca demeler3 cluster

Location:

trunk

Files:

• cleanup.php (modified) (3 diffs)
• cluster_status.php (modified) (2 diffs)
• gridctl.php (modified) (4 diffs)

trunk/cleanup.php

@@ -738 +738 @@
    $headers  = "From: $org_name Admin<$admin_email>"     . "\n";
    $headers .= "Cc: $org_name Admin<$admin_email>"       . "\n";
+   $headers .= "CC: $org_name Admin<alexsav.science@gmail.com>"       . "\n";
+   $headers .= "CC: $org_name Admin<gegorbet@gmail.com>"       . "\n";
 
    // Set the reply address
@@ -878 +880 @@
    global $dbhost;
    global $status;
+   
    $is_us3iab  = preg_match( "/us3iab/", $cluster );
    $is_jetstr  = preg_match( "/jetstream/", $cluster );
+   $is_demeler3 = preg_match( "/demeler3/", $cluster );
+
    $limshost   = $dbhost;
    $stderr     = '';
@@ -921 +926 @@
          $lworkdir = "/N/us3_cluster/work/local";
       }
+      
+      if ( $is_demeler3 )
+      {
+         $clushost = "demeler3.uleth.ca";
+   $lworkdir = "/home/us3/work"; 
+      }
+
       $cmd         = "ssh us3@$clushost 'ls -d $lworkdir' 2>/dev/null";
       exec( $cmd, $output, $stat );

trunk/cluster_status.php

@@ -176 +176 @@
    {
       if ( preg_match( "/attlocal/", $org_domain ) )
-         $clusters = array( "us3iab-devel", "alamo-local", "taito-local" );
+         $clusters = array( "us3iab-devel" );
       else
-         $clusters = array( "us3iab-node0", "taito-local" );
+         $clusters = array( "us3iab-node0",  "demeler3-local", "taito-local" );
    }
    else
@@ -224 +224 @@
             break;
          }
+
+        case 'demeler3-local':
+         {
+            $host   = "us3@demeler3.uleth.ca";
+            $qstat  = `ssh $host '/usr/bin/qstat -B 2>&1|tail -1'`;
+            $sparts = preg_split( '/\s+/', $qstat );
+            $que    = $sparts[ 3 ];
+            $run    = $sparts[ 4 ];
+            $sta    = $sparts[ 10 ];
+            if ( $sta == "Active" )
+               $sta    = "up";
+            else
+               $sta    = "down";
+            break;
+         }
+
          case 'jacinto':
          {

trunk/gridctl.php

@@ -5 +5 @@
 //include "$us3bin/cleanup_aira.php";
 //include "$us3bin/cleanup_gfac.php";
+//include "$us3bin/cleanup.php";
+
 
 // Global variables
@@ -841 +843 @@
 
    $is_jetstr = preg_match( "/jetstream/", $cluster );
+   $is_demeler3 = preg_match( "/demeler3/", $cluster );
+
    if ( $is_jetstr )
       $cmd    = "squeue -j $gfacID 2>&1|tail -n 1";
@@ -855 +859 @@
          $system = "$cluster";
       $system = preg_replace( "/\-local/", "", $system );
+
+      if ( $is_demeler3 )
+      {
+        $system = "demeler3.uleth.ca";
+      }
+      
       $cmd    = "/usr/bin/ssh -x us3@$system " . $cmd;
 //write_log( "$self  cmd: $cmd" );
@@ -993 +1003 @@
    $headers  = "From: $org_name Admin<$admin_email>"     . "\n";
    $headers .= "Cc: $org_name Admin<$admin_email>"       . "\n";
+   $headers .= "Cc: $org_name Admin<alexsav.science@gmail.com>"       . "\n";
    $headers .= "Bcc: Gary Gorbet<gegorbet@gmail.com>"    . "\n";     // make sure
+
 
    // Set the reply address