Changeset 182 for trunk/daemon

Timestamp:

08/03/05 14:59:16 (18 years ago)

Author:

bastiaans

Message:

daemon/togad.py:

• Additional heartbeat check and minor changes, short jobs are labeled with a incorrect finished date

File:

• trunk/daemon/togad.py (modified) (3 diffs)

trunk/daemon/togad.py

@@ -410 +410 @@
                 """
                 
-                heartbeat = 0
+                self.heartbeat = 0
                 
                 jobinfo = { }
@@ -449 +449 @@
 
                                 if check_change:
-                                        if self.jobinfoChanged( self.jobAttrs, job_id, jobinfo ) and self.jobAttrs[ job_id ]['status'] != 'E':
+                                        if self.jobinfoChanged( self.jobAttrs, job_id, jobinfo ) and self.jobAttrs[ job_id ]['status'] in [ 'R', 'Q' ]:
                                                 self.jobAttrs[ job_id ]['stop_timestamp'] = ''
                                                 self.jobAttrs[ job_id ] = self.setJobAttrs( self.jobAttrs[ job_id ], jobinfo )
@@ -467 +467 @@
                 """When all metrics have gone, check if any jobs have finished"""
 
-                for jobid, jobinfo in self.jobAttrs.items():
-
-                        # This is an old job, not in current jobinfo list anymore
-                        # it must have finished, since we _did_ get a new heartbeat
-                        #
-                        mytime = int( jobinfo['reported'] ) + int( jobinfo['poll_interval'] )
-
-                        if mytime < self.heartbeat and jobid not in self.jobs_processed and jobinfo['status'] == 'R':
-
-                                if not jobid in self.jobs_processed:
-                                        self.jobs_processed.append( jobid )
-
-                                self.jobAttrs[ jobid ]['status'] = 'F'
-                                self.jobAttrs[ jobid ]['stop_timestamp'] = str( mytime )
-
-                                if not jobid in self.jobs_to_store:
-                                        self.jobs_to_store.append( jobid )
-
-                debug_msg( 1, 'torque_xml_thread(): Storing..' )
-
-                for jobid in self.jobs_to_store:
-                        if self.jobAttrs[ jobid ]['status'] in [ 'R', 'Q', 'F' ]:
-                                self.ds.storeJobInfo( jobid, self.jobAttrs[ jobid ] )   
-
-                debug_msg( 1, 'torque_xml_thread(): Done storing.' )
-
-                self.jobs_processed = [ ]
-                self.jobs_to_store = [ ]
+                if self.heartbeat:
+                        for jobid, jobinfo in self.jobAttrs.items():
+
+                                # This is an old job, not in current jobinfo list anymore
+                                # it must have finished, since we _did_ get a new heartbeat
+                                #
+                                mytime = int( jobinfo['reported'] ) + int( jobinfo['poll_interval'] )
+
+                                if mytime < self.heartbeat and jobid not in self.jobs_processed and jobinfo['status'] == 'R':
+
+                                        if not jobid in self.jobs_processed:
+                                                self.jobs_processed.append( jobid )
+
+                                        self.jobAttrs[ jobid ]['status'] = 'F'
+                                        self.jobAttrs[ jobid ]['stop_timestamp'] = str( mytime )
+
+                                        if not jobid in self.jobs_to_store:
+                                                self.jobs_to_store.append( jobid )
+
+                        debug_msg( 1, 'torque_xml_thread(): Storing..' )
+
+                        for jobid in self.jobs_to_store:
+                                if self.jobAttrs[ jobid ]['status'] in [ 'R', 'Q', 'F' ]:
+                                        self.ds.storeJobInfo( jobid, self.jobAttrs[ jobid ] )   
+
+                        debug_msg( 1, 'torque_xml_thread(): Done storing.' )
+
+                        self.jobs_processed = [ ]
+                        self.jobs_to_store = [ ]
 
         def setJobAttrs( self, old, new ):