Changeset 512 for trunk/web/addons/job_monarch/overview.php

Timestamp:

03/07/08 17:58:33 (16 years ago)

Author:

bastiaans

Message:

web/addons/job_monarch/templates/overview.tpl,
web/addons/job_monarch/overview.php,
jobmond/jobmond.py:

• added Craig West's support for offline/down PBS nodes

File:

• trunk/web/addons/job_monarch/overview.php (modified) (5 diffs)

trunk/web/addons/job_monarch/overview.php

@@ -527 +527 @@
         $queued_cpus            = 0;
 
+        $na_nodes               = 0;
+        $na_cpus                = 0;
+
         $total_nodes            = 0;
         $total_cpus             = 0;
@@ -578 +581 @@
         $rjqj_host              = null;
 
+        $nodes_down             = null;
+        $nodes_offline          = null;
+
+        $replacestr = array();
+        $replacestr[] = "'";
+        $replacestr[] = " ";
+        
         foreach( $metrics as $bhost => $bmetric )
         {
@@ -586 +596 @@
                                 $rjqj_host      = $bhost;
                         }
+                        if( ( $mname == 'MONARCH-DOWN' ) )
+                        {
+                                $nodes_down = str_replace($replacestr,NULL,split(',',substr($mval['VAL'],1,-1)));
+                        }
+                        if( ( $mname == 'MONARCH-OFFLINE' ) )
+                        {
+                                $nodes_offline = str_replace($replacestr,NULL,split(',',substr($mval['VAL'],1,-1)));
+                        }
                 }
         }
 
+        $nodes_counted          = array();
+
+        if($nodes_down != NULL || $nodes_offline!=NULL )
+        {
+                foreach( $metrics as $bh => $bm )
+                {
+                        if (in_array($bh,$nodes_offline) && $gnodes[$bh])
+                        {
+                                $nodes_counted[] = $bh;
+                                if(! $gnodes[$bh]->getJobs())
+                                {
+                                        $na_cpus += ($bm['cpu_num'][VAL]);
+                                        $na_nodes += 1;
+                                }
+                        }
+                        if (in_array($bh,$nodes_down) && !in_array($bh,$nodes_counted) && $gnodes[$bh])
+                        {
+                                $nodes_counted[] = $bh;
+                                if(! $gnodes[$bh]->getJobs())
+                                {
+                                        $na_cpus += ($bm['cpu_num'][VAL]);
+                                        $na_nodes += 1;
+                                }
+                        }                               
+                }
+        }
+                
         // Running / queued amount jobs graph
         //
@@ -875 +920 @@
         $total_jobs             = $queued_jobs + $running_jobs;
 
-        $free_nodes             = $avail_nodes - $running_nodes;
+        $free_nodes             = $avail_nodes - $running_nodes - $na_nodes;
         $free_nodes             = ( $free_nodes >= 0 ) ? $free_nodes : 0;
-        $free_cpus              = $avail_cpus - $running_cpus;
+        $free_cpus              = $avail_cpus - $running_cpus - $na_cpus;
         $free_cpus              = ( $free_cpus >= 0 ) ? $free_cpus : 0;
 
@@ -886 +931 @@
         $tpl->assignGlobal( "queued_jobs", $queued_jobs );
         $tpl->assignGlobal( "queued_cpus", $queued_cpus );
+
+        $tpl->assignGlobal( "na_nodes", $na_nodes );
+        $tpl->assignGlobal( "na_cpus", $na_cpus );
 
         $tpl->assignGlobal( "total_nodes", $total_nodes );