Changeset 604 for trunk/web2/addons/job_monarch/jobstore.php

Timestamp:

02/17/09 15:57:35 (15 years ago)

Author:

ramonb

Message:

job_monarch/jobstore.php,
job_monarch/graph.php,
job_monarch/js/monarch.js:

• changed node graph to use own graph.php, since Ganglia's graph.php is broken for jobs
• correctly set/mark jobstart
• correctly select time period for job ranges

File:

• trunk/web2/addons/job_monarch/jobstore.php (modified) (3 diffs)

trunk/web2/addons/job_monarch/jobstore.php

@@ -489 +489 @@
                 $load_color     = load_color($load);
 
+                $reported       = (int) $jobs[$jid]['reported'];
+
+                $time           = time();
 
                 // RB: something broken here with JR / JS
                 //
-                //$job_runtime  = intval( $jobs[$jid]['reported'] ) - intval( $jobs[$jid]['start_timestamp'] );
-                $job_runtime    = date( 'u' ) - intval( $jobs[$jid]['start_timestamp'] );
-                $job_window     = intval( $job_runtime ) * 1.2;
+                $job_runtime    = $time - intval( $jobs[$jid]['start_timestamp'] );
+                //$job_runtime  = date( 'u' ) - intval( $jobs[$jid]['start_timestamp'] );
+                //$job_window   = intval( $job_runtime ) * 1.2;
 
                 $jobrange       = -$job_window;
-                $jobstart       = $jobs[$jid]['start_timestamp'];
+                $jobstart       = (int) $jobs[$jid]['start_timestamp'];
+                $period_start   = (int) ($time - (($time - $jobstart) * 1.1 ));
 
                 $nr['jid']      = $jid;
@@ -515 +519 @@
                 // maybe later to popup?
                 //
-                //$host_link      = "\"../../?c=$cluster_url&h=$host_url&r=job&jr=$jobrange&js=$jobstart\"";
+                //$host_link      = "\"../../?c=$cluster_url&h=$host_url&r=job&jr=$jobrange&job_start=$jobstart\"";
 
                 if ( $val["TYPE"] == "timestamp" || $always_timestamp[$metricname] )
@@ -527 +531 @@
                 else
                 {
+                        $end            = time();
                         $graphargs      = ($reports[$metricname]) ? "g=$metricname&" : "m=$metricname&";
-                        $graphargs      .= "c=$cluster_url&h=$host_url&l=$load_color&v=".$val['VAL']."&r=job&jr=$jobrange&js=$jobstart";
+                        $graphargs      .= "c=$cluster_url&h=$host_url&l=$load_color&v=".$val['VAL']."&r=job&period_start=$period_start&period_stop=$end&job_start=$jobstart";
 
                         if( $max > 0 )