Changeset 184

Timestamp:

08/03/05 16:34:28 (18 years ago)

Author:

bastiaans

Message:

daemon/togad.py:

• Delete jobs from memory after written to dbase

plugin/togap.py:

• Only accept job attrs changes for jobs in Q or R status

Location:

trunk

Files:

• daemon/togad.py (modified) (2 diffs)
• plugin/togap.py (modified) (1 diff)

trunk/daemon/togad.py

@@ -477 +477 @@
                                 mytime = int( jobinfo['reported'] ) + int( jobinfo['poll_interval'] )
 
-                                if mytime < self.heartbeat and jobid not in self.jobs_processed and jobinfo['status'] == 'R':
+                                if (mytime < self.heartbeat) and (jobid not in self.jobs_processed) and (jobinfo['status'] == 'R'):
 
                                         if not jobid in self.jobs_processed:
@@ -492 +492 @@
                         for jobid in self.jobs_to_store:
                                 if self.jobAttrs[ jobid ]['status'] in [ 'R', 'Q', 'F' ]:
-                                        self.ds.storeJobInfo( jobid, self.jobAttrs[ jobid ] )   
+
+                                        self.ds.storeJobInfo( jobid, self.jobAttrs[ jobid ] )
+
+                                        if self.jobAttrs[ jobid ]['status'] == 'F':
+                                                del self.jobAttrs[ jobid ]
 
                         debug_msg( 1, 'torque_xml_thread(): Done storing.' )

trunk/plugin/togap.py

@@ -259 +259 @@
                         myAttrs['poll_interval'] = TORQUE_POLL_INTERVAL
 
-                        if self.jobDataChanged( jobs, job_id, myAttrs ):
+                        if self.jobDataChanged( jobs, job_id, myAttrs ) and myAttrs['status'] in [ 'R', 'Q' ]:
                                 jobs[ job_id ] = myAttrs