Changeset 880

Timestamp:

05/18/13 18:25:10 (10 years ago)

Author:

ramonb

Message:

libtoga.php:

• allow searchDbase query to include running jobs

templates/search.tpl:

• added "include running jobs" checkbox

search.php:

• pass include running option submit to searchDbase
• some modifications to start/stop times for running jobs
• closes #167

Location:

branches/1.0/web/addons/job_monarch

Files:

• libtoga.php (modified) (3 diffs)
• search.php (modified) (5 diffs)
• templates/search.tpl (modified) (1 diff)

branches/1.0/web/addons/job_monarch/libtoga.php

@@ -211 +211 @@
     }
 
-    function searchDbase( $id = null, $queue = null, $owner = null, $name = null, $start_from_time = null, $start_to_time = null, $end_from_time = null, $end_to_time = null )
+    function searchDbase( $id = null, $queue = null, $owner = null, $name = null, $start_from_time = null, $start_to_time = null, $end_from_time = null, $end_to_time = null, $include_running = false )
     {
         global $SEARCH_RESULT_LIMIT;
 
+        if( $include_running )
+        {
+            $status_query = " AND job_status != 'Q'";
+        }
+        else
+        {
+            $status_query = " AND job_status = 'F'";
+        }
+
         if( $id )
         {
-            $select_query = "SELECT job_id FROM jobs WHERE job_id = '$id' AND job_status = 'F'";
+            $select_query = "SELECT job_id FROM jobs WHERE job_id = '$id'" . $status_query;
             $this->resultcount = 1;
         }
@@ -253 +262 @@
             }
 
-            $query = "FROM jobs WHERE job_status = 'F' AND ";
+            $query = "FROM jobs WHERE ";
             $extra_query_args = '';
 
@@ -267 +276 @@
                 }
             }
-            $query .= $extra_query_args;
+            $query .= $extra_query_args . $status_query;
 
             $count_result_idname = "COUNT(job_id)";

branches/1.0/web/addons/job_monarch/search.php

@@ -226 +226 @@
     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, $COLUMN_NODES, $metricname, $self, $conf;
+    global $SEARCH_RESULT_LIMIT, $COLUMN_NODES, $metricname, $self, $conf, $include_running;
+
 
     $longtitle = "Batch Archive Search :: Powered by Job Monarch!";
@@ -236 +237 @@
     $tpl_data = new Dwoo_Data();
 
+    if( in_array( $include_running, array('on','checked','true','yes') ) )
+    {
+        $include_running = true;
+        $tpl_data->assign( "running_checked", "checked='on'" );
+    }
     $tpl_data->assign( "self", $self );
     $tpl_data->assign( "cluster", $clustername );
@@ -264 +270 @@
         if( $end_from_time ) $end_from_time = datetimeToEpoch( $end_from_time );
         if( $end_to_time ) $end_to_time = datetimeToEpoch( $end_to_time );
-        $search_ids = $tdb->searchDbase( $id, $queue, $owner, $name, $start_from_time, $start_to_time, $end_from_time, $end_to_time );
+        $search_ids = $tdb->searchDbase( $id, $queue, $owner, $name, $start_from_time, $start_to_time, $end_from_time, $end_to_time, $include_running );
 
         //print_r( $search_ids );
@@ -354 +360 @@
             $job_start = $job['start_timestamp'];
             $job_stop = $job['stop_timestamp'];
-            $runningtime = intval( $job_stop - $job_start );
+
+            if( $job['status'] == 'R' )
+            {
+                $period_stop = time();
+                $runningtime = $period_stop - intval( $job_start );
+                $period_start = intval( $job_start - (intval( $runningtime * 0.10 ) ) );
+                $node_list["finished"]= '';
+            }
+            else
+            {
+                $runningtime = intval( $job_stop - $job_start );
+                $node_list["finished"]= makeDate( $job_stop );
+            }
+
             $node_list["started"]= makeDate( $job_start );
-            $node_list["finished"]= makeDate( $job_stop );
             $node_list["runningtime"]= makeTime( $runningtime );
             
@@ -371 +389 @@
             $tpl_data->assign("checked$showhosts", "checked");
 
-            if( $showhosts ) {
-
-                if( !$period_start ) // Add an extra 10% to graphstart
+            if( $showhosts ) 
+            {
+                if( $job['status'] == 'R' )
+                {
+                    $period_stop = time();
+                    $runningtime = $period_stop - intval( $job_start );
                     $period_start = intval( $job_start - (intval( $runningtime * 0.10 ) ) );
+                }
                 else
-                    $period_start = datetimeToEpoch( $period_start );
-
-                if( !$period_stop ) // Add an extra 10% to graphend
-                    $period_stop = intval( $job_stop + (intval( $runningtime * 0.10 ) ) );
-                else
-                    $period_stop = datetimeToEpoch( $period_stop );
+                {
+                    if( !$period_start ) // Add an extra 10% to graphstart
+                    {
+                        $period_start = intval( $job_start - (intval( $runningtime * 0.10 ) ) );
+                    }
+                    else
+                    {
+                        $period_start = datetimeToEpoch( $period_start );
+                    }
+
+                    if( !$period_stop ) // Add an extra 10% to graphend
+                    {
+                        $period_stop = intval( $job_stop + (intval( $runningtime * 0.10 ) ) );
+                    }
+                    else
+                    {
+                        $period_stop = datetimeToEpoch( $period_stop );
+                    }
+                }
+
 
                 $tpl_data->assign( "timeperiod", "yes" );

branches/1.0/web/addons/job_monarch/templates/search.tpl

@@ -187 +187 @@
   <TD></TD>
   <TD></TD>
-  <TD></TD>
+  <TD><input type="checkbox" name="include_running" {$running_checked}>Include running jobs</TD>
   <TD>
   <INPUT TYPE="submit" VALUE="Search archive" onClick="setSearchTimestamps();">