Changeset 299

Timestamp:

04/06/07 13:21:35 (16 years ago)

Author:

bastiaans

Message:

web/addons/job_monarch/conf.php:

• added COLUMN_NODES option to display job node hostnames column

web/addons/job_monarch/search.php,
web/addons/job_monarch/overview.php:

• added handling of COLUMN_NODES

web/addons/job_monarch/templates/search.tpl,
web/addons/job_monarch/templates/overview.tpl:

• added COLUMN_NODES to html

Location:

trunk/web/addons/job_monarch

Files:

• conf.php (modified) (1 diff)
• overview.php (modified) (5 diffs)
• search.php (modified) (3 diffs)
• templates/overview.tpl (modified) (2 diffs)
• templates/search.tpl (modified) (2 diffs)

trunk/web/addons/job_monarch/conf.php

@@ -15 +15 @@
 //
 $COLUMN_QUEUED = 1;
+
+// Show the column job attribute 'nodes' hostnames?
+//
+$COLUMN_NODES = 1;
 
 // Path to Ganglia's web frontend root

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, $hostname, $piefilter;
+global $hosts_up, $m, $start, $end, $filterorder, $COLUMN_REQUESTED_MEMORY, $COLUMN_QUEUED, $COLUMN_NODES, $hostname, $piefilter;
 
 $data_gatherer = new DataGatherer( $clustername );
@@ -466 +466 @@
         global $cluster_url, $get_metric_string, $host_url, $metrics;
         global $start, $end, $reports, $gnodes, $default_showhosts;
-        global $COLUMN_QUEUED, $COLUMN_REQUESTED_MEMORY, $hostname;
+        global $COLUMN_QUEUED, $COLUMN_REQUESTED_MEMORY, $COLUMN_NODES, $hostname;
         $metricname = $m;
 
@@ -512 +512 @@
         if( $COLUMN_REQUESTED_MEMORY ) {
                 $tpl->newBlock( "column_header_req_mem" );
+        }
+
+        if( $COLUMN_NODES ) {
+                $tpl->newBlock( "column_header_nodes" );
         }
 
@@ -642 +646 @@
                                 }
 
+
                                 if( $COLUMN_QUEUED ) {
                                         $tpl->newBlock( "column_queued" );
@@ -658 +663 @@
                                 $view_jobs++;
 
-                                if( $jobs[$jobid][status] == 'R' )
+                                if( $jobs[$jobid][status] == 'R' ) {
                                         foreach( $jobs[$jobid][nodes] as $tempnode )
                                                 $view_name_nodes[] = $tempnode;
-                                else if( $jobs[$jobid][status] == 'Q' )
+
+                                        if( $COLUMN_NODES ) {
+                                                $tpl->newBlock( "column_nodes" );
+                                                $nodes_hostnames = implode( " ", $jobs[$jobid][nodes] );
+                                                $tpl->assign( "nodes_hostnames", $nodes_hostnames );
+                                                $tpl->gotoBlock( "node" );
+                                        }
+                                } else if( $jobs[$jobid][status] == 'Q' ) {
                                         $view_nodes += (int) $jobs[$jobid][nodes];
+                                }
 
                                 if( $even ) {

trunk/web/addons/job_monarch/search.php

@@ -325 +325 @@
         global $end_from_time, $end_to_time, $filter, $default_showhosts, $m, $hosts_up, $hc;
         global $period_start, $period_stop, $sortby, $sortorder, $COLUMN_REQUESTED_MEMORY;
-        global $SEARCH_RESULT_LIMIT;
+        global $SEARCH_RESULT_LIMIT, $COLUMN_NODES;
 
         $metricname = $m;
@@ -377 +377 @@
                         $tpl->newBlock( "column_header_req_mem" );
                 }
+                if( $COLUMN_NODES ) {
+                        $tpl->newBlock( "column_header_nodes" );
+                }
 
                 //print_r( $nodes );
@@ -402 +405 @@
                         if( $COLUMN_REQUESTED_MEMORY ) {
                                 $tpl->newBlock( "column_req_mem" );
-                                $tpl->assign( "req_memory", $jobs[$jobid][requested_memory] );
+                                //$tpl->assign( "req_memory", $jobs[$jobid][requested_memory] );
+                                $tpl->assign( "req_memory", $job[requested_memory] );
+                                $tpl->gotoBlock( "node" );
+                        }
+                        if( $COLUMN_NODES) {
+
+                                foreach( $nodes[$foundid] as $mynode )
+                                        $job_nodes[] = $mynode[hostname];
+
+                                $tpl->newBlock( "column_nodes" );
+                                $nodes_hostnames = implode( " ", $job_nodes );
+                                $tpl->assign( "nodes_hostnames", $nodes_hostnames );
                                 $tpl->gotoBlock( "node" );
                         }

trunk/web/addons/job_monarch/templates/overview.tpl

@@ -152 +152 @@
 <TH><B><A HREF="#" onClick="setSort( 'queued' )">Queued</A></B></TH>
 <!-- END BLOCK : column_header_queued -->
+<!-- START BLOCK : column_header_nodes -->
+<TH><B><A HREF="#" onClick="setSort( 'nodes' )" ALT="Nodes" TITLE="Nodes">Nodes</A></B></TH>
+<!-- END BLOCK : column_header_nodes -->
 <TH><B><A HREF="#" onClick="setSort( 'start' )">Started</A></B></TH>
 <TH><B><A HREF="#" onClick="setSort( 'runningtime' )">Runningtime</A></B></TH>
@@ -179 +182 @@
     <TD>{queued}</TD>
 <!-- END BLOCK : column_queued -->
+<!-- START BLOCK : column_nodes -->
+    <TD>{nodes_hostnames}</TD>
+<!-- END BLOCK : column_nodes -->
     <TD>{started}</TD>
     <TD>{runningtime}</TD>

trunk/web/addons/job_monarch/templates/search.tpl

@@ -214 +214 @@
 <!-- END BLOCK : column_header_req_mem -->
 <TH><B><A HREF="#" onClick="setSort( 'nodes' )" ALT="Nodes" TITLE="Nodes">N</A>/<A HREF="#" onClick="setSort( 'cpus' )" ALT="Processors" TITLE="Processors">P</A></B></TH>
+<!-- START BLOCK : column_header_nodes -->
+<TH><B><A HREF="#" onClick="setSort( 'nodes' )" ALT="Nodes" TITLE="Nodes">Nodes</A></B></TH>
+<!-- END BLOCK : column_header_nodes -->
 <TH><B><A HREF="#" onClick="setSort( 'start' )">Started</A></B></TH>
 <TH><B><A HREF="#" onClick="setSort( 'finished' )">Finished</A></B></TH>
@@ -239 +242 @@
 <!-- END BLOCK : column_req_mem -->
     <TD>{nodes}/{cpus}</TD>
+<!-- START BLOCK : column_nodes -->
+    <TD>{nodes_hostnames}</TD>
+<!-- END BLOCK : column_nodes -->
     <TD>{started}</TD>
     <TD>{finished}</TD>