Changeset 550 for trunk

Timestamp:

07/14/08 14:31:03 (16 years ago)

Author:

ramonb

Message:

job_monarch/image.php:

• fix filter typos

job_monarch/js/jobgrid.js:

• fixed filter cell click enable/disable check
• reloading is now a function
• wil reload both grid and clusterimage now when filters are changed

job_monarch/jobstore.php:

• set memory limit
• respect host filter
• use fqdn setting for nodes

Location:

trunk/web2/addons/job_monarch

Files:

• image.php (modified) (2 diffs)
• jobstore.php (modified) (8 diffs)
• js/jobgrid.js (modified) (5 diffs)

trunk/web2/addons/job_monarch/image.php

@@ -56 +56 @@
 $clustername = $httpvars->getClusterName();
 
-if( isset($id) && ($id!='')) $filter[id]=$id;
+if( isset($jid) && ($jid!='')) $filter[jid]=$jid;
 if( isset($state) && ($state!='')) $filter[state]=$state;
-if( isset($user) && ($user!='')) $filter[user]=$user;
+if( isset($owner) && ($owner!='')) $filter[owner]=$owner;
 if( isset($queue) && ($queue!='')) $filter[queue]=$queue;
 if( isset($host) && ($host!='')) $filter[host]=$host;
@@ -117 +117 @@
                         switch( $filtername ) {
 
-                                case "id":
+                                case "jid":
                                         $ic->setFilter( 'jobid', $filtervalue );
                                         break;
-                                case "user":
+                                case "owner":
                                         $ic->setFilter( 'owner', $filtervalue);
                                         break;

trunk/web2/addons/job_monarch/jobstore.php

@@ -1 +1 @@
 <?php
+
+ini_set("memory_limit","100M");
+set_time_limit(0);
 
 $c                      = $_POST["c"];
@@ -20 +23 @@
 $status                 = isset($_POST['status']) ? $_POST['status'] : null;
 $queue                  = isset($_POST['queue']) ? $_POST['queue'] : null;
+$host                   = isset($_POST['host']) ? $_POST['host'] : null;
 
 global $c, $clustername, $cluster;
@@ -222 +226 @@
 function filterJobs( $jobs )
 {
-        global $jid, $owner, $queue,  $status;
+        global $jid, $owner, $queue,  $status, $host, $use_fqdn;
 
         $filtered_jobs  = array();
@@ -240 +244 @@
                                 {
                                         $nodes = count( $jobattrs[nodes] );
+
+                                        $mynodehosts = array();
+                                        foreach( $jobattrs[nodes] as $mynode )
+                                        {
+                                                if( $use_fqdn == 1)
+                                                {
+                                                        $mynode = $mynode.".".$jobattrs[domain];
+                                                }
+                                                $mynodehosts[]  = $mynode;
+                                        }
+                                        $jobattrs[nodes] = $mynodehosts;
                                 }
                                 else
@@ -251 +266 @@
                                 $start_time     = (int) $jobattrs[start_timestamp];
                                 $runningtime    = $report_time - $start_time;
-        
+
+                                $domain         = $jobattrs[domain];
+                                $domain_len     = 0 - strlen( $domain );
+
                                 $keepjob        = true;
 
@@ -261 +279 @@
                                         }
                                 }
+
+                                if( $host )
+                                {
+                                        if( $state == 'R' )
+                                        {
+                                                $jnodes = $jobattrs['nodes'];
+
+                                                $keepjob = false;
+
+                                                foreach( $jnodes as $jnode)
+                                                {
+                                                        if( $jnode == $host )
+                                                        {
+                                                                $keepjob = true;
+                                                        }
+                                                }
+                                        }
+                                        else
+                                        {
+                                                $keepjob = false;
+                                        }
+                                }
                                 if( $owner )
                                 {
@@ -295 +335 @@
 {
         global $jobs, $hearbeat, $pstart, $pend;
-        global $sortfield, $sortorder, $query;
+        global $sortfield, $sortorder, $query, $host;
         global $jid, $owner, $queue,  $status;
 
@@ -316 +356 @@
                 $jobs                   = quickSearchJobs( $jobs, $query );
         }
-        if( $jid || $owner || $queue || $status )
+        if( $jid || $owner || $queue || $status || $host )
         {
                 $jobs                   = filterJobs( $jobs );

trunk/web2/addons/job_monarch/js/jobgrid.js

@@ -94 +94 @@
   {
     delete myfilters['host'];
-  }
-
+    delete myparams['host'];
+  }
+
+  reloadClusterImage();
+  reloadJobStore();
+
+  return false;
+}
+
+function reloadJobStore()
+{
+  // Respect any other parameters that may have been set outside filters
+  //
+  myparams = joinMyArray( myparams, myfilters );
+
+  // Can't be sure if there are enough pages for new filter: reset to page 1
+  //
+  myparams = joinMyArray( myparams, { start: 0, limit: 30 } );
+
+  JobsDataStore.reload( { params: myparams } );
+}
+
+function reloadClusterImage()
+{
   ClusterImageArgs['view'] = 'big-clusterimage';
 
@@ -102 +124 @@
 
   document.getElementById( 'clusterimage' ).src = './image.php?' + filt_url + '&' + imag_url;
-
-  return false;
 }
 
@@ -120 +140 @@
     if( fieldName == 'owner' || fieldName == 'jid' || fieldName == 'status' || fieldName == 'queue' )
     {
-      if( !isset( myfilters[fieldName] ) )
+      if( inMyArrayKeys( myfilters, fieldName ) )
       {
         Ext.fly(cell).removeClass( 'filterenabled' );
@@ -130 +150 @@
         delete myparams[fieldName];
 
-        // Respect any other parameters that may have been set outside filters
-        //
-        myparams = joinMyArray( myparams, myfilters );
-
-        // Can't be sure if there are enough pages for new filter: reset to page 1
-        //
-        myparams = joinMyArray( myparams, { start: 0, limit: 30 } );
-
-        grid.getStore().reload( { params: myparams } );
+        reloadJobStore();
+        reloadClusterImage();
       }
       else
@@ -149 +162 @@
         myfilters[fieldName] = data;
 
-        myparams = joinMyArray( myparams, myfilters );
-        myparams = joinMyArray( myparams, { start: 0, limit: 30 } );
-
-        grid.getStore().reload( { params: myparams } );
+        reloadJobStore();
+        reloadClusterImage();
       }
     }