Changeset 535 for trunk

Timestamp:

07/10/08 15:54:35 (15 years ago)

Author:

ramonb

Message:

• add tooltips & runningtime

Location:

trunk/web2/addons/job_monarch

Files:

• jobstore.php (modified) (4 diffs)
• js/jobgrid.js (modified) (15 diffs)

trunk/web2/addons/job_monarch/jobstore.php

@@ -52 +52 @@
 function getList() 
 {
-        global $jobs;
+        global $jobs, $hearbeat;
 
-        //print_r( $jobs );
         $job_count      = count( $jobs );
 
@@ -67 +66 @@
         foreach( $jobs as $jobid => $jobattrs )
         {
-                if( $reported != $heartbeat )
-                { // Old job: skip
-                        continue;
-                }
+                //if( $jobattrs['reported'] != $heartbeat )
+                //{
+                //      continue;
+                //}
 
                 $jr['jid']              = strval( $jobid );
@@ -79 +78 @@
                 $jr['requested_time']   = makeTime( timeToEpoch( $jobattrs['requested_time'] ) );
 
-                if( $jobattrs[status] == 'R' )
+                if( $jr['status'] == 'R' )
                 {
                         $nodes          = count( $jobattrs[nodes] );
@@ -88 +87 @@
                 }
 
-                //unset( $jr['nodes'] );
-                //unset( $jr['poll_interval'] );
-                //unset( $jr['reported'] );
+                $jr['ppn']              = strval( $jobattrs[ppn] ? $jobattrs[ppn] : 1 );
+                $jr['nodect']           = strval( $nodes );
 
-                $jr['ppn']              = strval( $jobattrs[ppn] ? $jobattrs[ppn] : 1 );
-                $jr['cpu']              = strval( $nodes * (int) $ppn );
-
-
-                if( $jobattrs[status] == 'R' )
+                if( $jr['status'] == 'R' )
                 {
                         $jr['nodes']    = implode( ",", $jobattrs['nodes'] );
+                }
+                else
+                {
+                        $jr['nodes']    = "";
                 }
 
                 $jr['queued_timestamp'] = makeDate( $jobattrs['queued_timestamp'] );
                 $jr['start_timestamp']  = ($jobattrs['start_timestamp'] ? makeDate( $jobattrs['start_timestamp'] ) : "");
+
+                if( $jr['status'] == 'R' )
+                {
+                        $runningtime            = (int) $jobattrs['reported'] - (int) $jobattrs['start_timestamp'];
+                        $jr['runningtime']      = makeTime( $runningtime );
+                }
+                else
+                {
+                        $jr['runningtime']      = "";
+                }
 
                 $jobresults[]           = $jr;

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

@@ -3 +3 @@
 var JobListingEditorGrid;
 var JobListingWindow;
+var JobProxy;
 
 Ext.onReady(function(){
@@ -30 +31 @@
         //{name: 'requested_memory', type: 'string', mapping: 'requested_memory'},
         {name: 'ppn', type: 'int', mapping: 'ppn'},
-        {name: 'cpu', type: 'int', mapping: 'cpu'},
+        {name: 'nodect', type: 'int', mapping: 'nodect'},
         {name: 'nodes', type: 'string', mapping: 'nodes'},
         {name: 'queued_timestamp', type: 'string', mapping: 'queued_timestamp'},
-        {name: 'start_timestamp', type: 'string', mapping: 'start_timestamp'}
+        {name: 'start_timestamp', type: 'string', mapping: 'start_timestamp'},
+        {name: 'runningtime', type: 'string', mapping: 'runningtime'}
       ]),
       sortInfo:{field: 'jid', direction: "ASC"}
@@ -41 +43 @@
     [{
         header: '#',
+        tooltip: 'Job id',
         readOnly: true,
         dataIndex: 'jid',
@@ -47 +50 @@
       },{
         header: 'S',
+        tooltip: 'Job status',
         readOnly: true,
         dataIndex: 'status',
@@ -53 +57 @@
       },{
         header: 'User',
+        tooltip: 'Owner of job',
         readOnly: true,
         dataIndex: 'owner',
@@ -59 +64 @@
       },{
         header: 'Queue',
+        tooltip: 'In which queue does this job reside',
         readOnly: true,
         dataIndex: 'queue',
@@ -65 +71 @@
       },{
         header: 'Name',
+        tooltip: 'Name of job',
         readOnly: true,
         dataIndex: 'name',
@@ -71 +78 @@
       },{
         header: 'Requested Time',
+        tooltip: 'Amount of requested time (wallclock)',
         readOnly: true,
         dataIndex: 'requested_time',
@@ -77 +85 @@
       },{
         header: 'Requested Memory',
+        tooltip: 'Amount of requested memory',
         readOnly: true,
         dataIndex: 'requested_memory',
@@ -82 +91 @@
         hidden: true
       },{
-        header: 'PPN',
+        header: 'P',
+        tooltip: 'Number of processors per node (PPN)',
         readOnly: true,
         dataIndex: 'ppn',
@@ -88 +98 @@
         hidden: false
       },{
-        header: 'CPU',
+        header: 'N',
+        tooltip: 'Number of nodes (hosts)',
         readOnly: true,
-        dataIndex: 'ppn',
+        dataIndex: 'nodect',
         width: 25,
         hidden: false
@@ -101 +112 @@
       },{
         header: 'Queued',
+        tooltip: 'At what time did this job enter the queue',
         readOnly: true,
         dataIndex: 'queued_timestamp',
@@ -107 +119 @@
       },{
         header: 'Started',
+        tooltip: 'At what time did this job enter the running status',
         readOnly: true,
         dataIndex: 'start_timestamp',
+        width: 140,
+        hidden: false
+      },{
+        header: 'Runningtime',
+        tooltip: 'How long has this job been in the running status',
+        readOnly: true,
+        dataIndex: 'runningtime',
         width: 140,
         hidden: false
@@ -1173 +1193 @@
       title: 'Cluster Jobs Overview',
       closable:true,
-      width:700,
-      height:350,
+      width:900,
+      height:500,
       plain:true,
       layout: 'fit',
@@ -1181 +1201 @@
 
   //debug();  
+  //JobListingEditorGrid.store.url='jobstore.php?c=GINA Cluster';
   JobsDataStore.load();
-  //JobListingEditorGrid.render();
   JobListingWindow.show();