Changeset 783

Timestamp:

03/31/13 21:35:31 (11 years ago)

Author:

ramonb

Message:

• make sure finished jobs get removed from jobAttrsSaved to prevent memory leak

File:

• branches/0.4/jobarchived/jobarchived.py (modified) (6 diffs)

branches/0.4/jobarchived/jobarchived.py

@@ -889 +889 @@
         """When all metrics have gone, check if any jobs have finished"""
 
+        jobs_finished = [ ]
+
         debug_msg( 1, "XML: Processed "+str(self.elementct)+ " elements - found "+str(len(self.jobs_processed))+" jobs" )
 
@@ -908 +910 @@
 
                 elif jobid not in self.jobs_processed:
+
                     # Was running previous heartbeat but not anymore: must be finished
                     self.jobAttrs[ jobid ]['status'] = 'F'
@@ -913 +916 @@
                     debug_msg( 1, 'job %s appears to have finished' %jobid )
 
+                    jobs_finished.append( jobid )
+
                     if not jobid in self.jobs_to_store:
                         self.jobs_to_store.append( jobid )
@@ -919 +924 @@
 
             elif self.jobAttrsSaved.has_key( jobid ):
+
+                # This should pretty much never happen, but hey let's be careful
+                # Perhaps if someone altered their job while in queue with qalter
 
                 if self.jobinfoChanged( jobid, jobinfo ):
@@ -949 +957 @@
                 self.ds.storeJobInfo( jobid, self.jobAttrs[ jobid ] )
 
-                self.jobAttrsSaved[ jobid ] = self.jobAttrs[ jobid ]
+                if not jobid in jobs_finished:
+
+                    self.jobAttrsSaved[ jobid ] = self.jobAttrs[ jobid ]
+
+                elif self.jobAttrsSaved.has_key( jobid ):
+
+                    del self.jobAttrsSaved[ jobid ]
 
                 if self.jobAttrs[ jobid ]['status'] == 'F':
@@ -961 +975 @@
 
         self.jobs_processed = [ ]
+
+        # TODO: once in while check database AND self.jobAttrsSaved for stale jobs
 
     def setJobAttrs( self, old, new ):