Changeset 263

Timestamp:

06/23/06 17:44:29 (17 years ago)

Author:

bastiaans

Message:

web/addons/job_monarch/overview.php:

• added: &h=<host> ability: shows jobs running on that host
• removed some old bogus code and comments
• changed: node hostname parsing to always use fqdn. prevents additional ghost nodes from appearing

web/addons/job_monarch/index.php:

• removed: seperate non-existant host_view parsing allows hostname argument to be parsed by overview.php

Location:

trunk/web/addons/job_monarch

Files:

• index.php (modified) (4 diffs)
• overview.php (modified) (9 diffs)

trunk/web/addons/job_monarch/index.php

@@ -303 +303 @@
         }
 
+        //$ex_fn = $tpl->getVarValue( "_ROOT", "form_name" );
+
         if( $view == "search" or $view == "host" ) {
 
@@ -375 +377 @@
 if( isset( $h ) and $h != '' ) {
         $hostname = $h;
-        $view = "host";
+        //$view = "host";
 }
 
@@ -390 +392 @@
                 break;
 
-        case "host":
-
-                includeHostPage();
-                break;
+        //case "host":
+
+        //      includeHostPage();
+        //      break;
 
         default:
@@ -423 +425 @@
                 break;
 
-        case "host":
-
-                include "./host_view.php";
-                makeHostView();
-                break;
+        //case "host":
+
+        //      include "./host_view.php";
+        //      makeHostView();
+        //      break;
 
         default:

trunk/web/addons/job_monarch/overview.php

@@ -24 +24 @@
 
 global $GANGLIA_PATH, $clustername, $tpl, $filter, $cluster, $get_metric_string, $cluster_url, $sh;
-global $hosts_up, $m, $start, $end, $filterorder, $COLUMN_REQUESTED_MEMORY, $COLUMN_QUEUED;
-
-//$tpl->assign("_ROOT.summary", "" );
+global $hosts_up, $m, $start, $end, $filterorder, $COLUMN_REQUESTED_MEMORY, $COLUMN_QUEUED, $hostname, $piefilter;
 
 $data_gatherer = new DataGatherer( $clustername );
 
-//$tpl->assign( "self", "./index.php" );
 $tpl->assign( "clustername", $clustername );
 
@@ -43 +40 @@
 $cpus = $data_gatherer->getCpus();
 
-$filter_image_url = "";
-
-foreach( $filter as $filtername => $filtervalue ) {
-        $tpl->assign( "f_".$filtername, $filtervalue );
-        $filter_image_url .= "&$filtername=$filtervalue";
-}
-
-$tpl->assign( "clusterimage", "./image.php?c=".rawurlencode($clustername)."&view=big-clusterimage".$filter_image_url );
-$tpl->assign( "f_order", $filterorder );
-
-if( array_key_exists( "id", $filter ) )
-        $piefilter = 'id';
-else if( array_key_exists( "user", $filter ) )
-        $piefilter = 'user';
-else if( array_key_exists( "queue", $filter ) )
-        $piefilter = 'queue';
-
-$pie = drawPie();
-$tpl->assign("pie", $pie );
-
-//if( !array_key_exists( 'id', $filter ) ) {
-
-//      $graph_args = "c=$cluster_url&$get_metric_string&st=$cluster[LOCALTIME]";
-//      $tpl->newBlock( "average_graphs" );
-//      $tpl->assign( "graph_args", $graph_args );
-//}
+function setupFilterSettings() {
+        global $tpl, $filter, $clustername, $piefilter;
+
+        $filter_image_url = "";
+
+        $tpl->gotoBlock( "_ROOT" );
+
+        foreach( $filter as $filtername => $filtervalue ) {
+                $tpl->assign( "f_".$filtername, $filtervalue );
+                $filter_image_url .= "&$filtername=$filtervalue";
+        }
+
+        $tpl->assign( "clusterimage", "./image.php?c=".rawurlencode($clustername)."&view=big-clusterimage".$filter_image_url );
+        $tpl->assign( "f_order", $filterorder );
+
+        if( array_key_exists( "id", $filter ) )
+                $piefilter = 'id';
+        else if( array_key_exists( "user", $filter ) )
+                $piefilter = 'user';
+        else if( array_key_exists( "queue", $filter ) )
+                $piefilter = 'queue';
+
+        $pie = drawPie();
+        $tpl->assign("pie", $pie );
+}
 
 function timeToEpoch( $time ) {
@@ -470 +466 @@
         global $cluster_url, $get_metric_string, $host_url, $metrics;
         global $start, $end, $reports, $gnodes, $default_showhosts;
-        global $COLUMN_QUEUED, $COLUMN_REQUESTED_MEMORY;
+        global $COLUMN_QUEUED, $COLUMN_REQUESTED_MEMORY, $hostname;
         $metricname = $m;
 
@@ -521 +517 @@
                 $tpl->newBlock( "column_header_queued" );
         }
+
+        $last_displayed_job = null;
 
         foreach( $sorted_jobs as $jobid => $sortdec ) {
@@ -547 +545 @@
                                 $running_jobs++;
 
-                                foreach( $jobs[$jobid][nodes] as $tempnode )
+                                foreach( $jobs[$jobid][nodes] as $tempnode ) {
                                         $running_name_nodes[] = $tempnode;
+
+                                        if( isset( $hostname ) && $hostname != '' )
+                                                //$filter[host] = $hostname;
+
+                                                $domain_len = 0 - strlen( $jobs[$jobid][domain] );
+                                                $hostnode = $tempnode;
+                                                if( substr( $hostnode, $domain_len ) != $jobs[$jobid][domain] ) {
+                                                        $hostnode = $hostnode. '.'. $jobs[$jobid][domain];
+                                                }
+
+                                                if( isset($hostname) && $hostname != '' && $hostname != $hostnode )
+                                                        $display_job = 0;
+                                }
                         }
 
                         if( $jobs[$jobid][status] == 'Q' ) {
+                                if( isset( $hostname ) && $hostname != '' )
+                                        $display_job = 0;
+
                                 $queued_cpus += $cpus;
                                 $queued_nodes += $nodes;
@@ -574 +588 @@
                                 $tpl->assign( "clustername", $clustername );
                                 $tpl->assign("id", $jobid );
+
+                                $last_displayed_job = $jobid;
+
                                 $tpl->assign("state", $jobs[$jobid][status] );
 
@@ -672 +689 @@
         $total_jobs = $queued_jobs + $running_jobs;
 
-        //$tpl->assignGlobal("cpus_nr", $overview_cpus );
-        //$tpl->assignGlobal("jobs_nr", $overview_jobs );
-
         $tpl->assignGlobal("avail_nodes", $avail_nodes );
         $tpl->assignGlobal("avail_cpus", $avail_cpus );
@@ -705 +719 @@
 
         $tpl->assignGlobal("report_time", makeDate( $heartbeat));
-        
-        //$tpl->assignGlobal("f_cpus_nr", $f_cpus );
-        //$tpl->assignGlobal("f_jobs_nr", $f_jobs );
+
+        //if( intval($view_jobs) == 1 and $start_time )
+        //      if( $last_displayed_job != null )
+        //              $filter[id] = $last_displayed_job;
+
+        //makeHeader();
+        setupFilterSettings();
 
         if( intval($view_jobs) == 1 and $start_time ) {
+
                 $tpl->newBlock( "showhosts" );
 
                 # Present a width list
                 $cols_menu = "<SELECT NAME=\"hc\" OnChange=\"toga_form.submit();\">\n";
+
 
                 $hostcols = ($hc) ? $hc : 4;
@@ -755 +775 @@
                         else
                                 $metricval = "m";
-                                                
+                                
                         foreach ($hosts_up as $host ) {