Changeset 96 for trunk

Timestamp:

04/20/05 10:35:19 (18 years ago)

Author:

bastiaans

Message:

daemon/togad.py:

• Empty values will now be properly ignored for dbase
• Rewrote job ending determination and fixed a bug in it

daemon/job_dbase.sql:

• Changed constraints on delete; keep nodes, delete job

Location:

trunk/daemon

Files:

• job_dbase.sql (modified) (1 diff)
• togad.py (modified) (5 diffs)

trunk/daemon/job_dbase.sql

@@ -23 +23 @@
 CREATE TABLE job_nodes (
         job_id                  INT NOT NULL REFERENCES jobs ON DELETE CASCADE,
-        node_id                 INT NOT NULL REFERENCES nodes ON DELETE CASCADE,
+        node_id                 INT NOT NULL REFERENCES nodes ON DELETE RESTRICT,
         PRIMARY KEY ( job_id, node_id )
 );

trunk/daemon/togad.py

@@ -189 +189 @@
                 for valname, value in jobattrs.items():
 
-                        if valname in job_values and value:
+                        if valname in job_values and value != '':
 
                                 column_name = 'job_' + valname
@@ -409 +409 @@
                 
                 jobinfo = { }
+                self.jobs_processed = [ ]
 
                 if name == 'METRIC':
@@ -421 +422 @@
                                 job_id = metricname.split( 'TOGA-JOB-' )[1]
                                 val = attrs.get( 'VAL', "" )
+
+                                if not job_id in self.jobs_processed:
+                                        self.jobs_processed.append( job_id )
 
                                 check_change = 0
@@ -464 +468 @@
                         # it must have finished, since we _did_ get a new heartbeat
                         #
-                        if jobinfo['reported'] < self.heartbeat and jobinfo['status'] == 'R' and jobid not in self.jobs_to_store:
+                        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 job_id in self.jobs_processed:
+                                        self.jobs_processed.append( jobid )
 
                                 self.jobAttrs[ jobid ]['status'] = 'F'
                                 self.jobAttrs[ jobid ]['stop_timestamp'] = str( int( jobinfo['reported'] ) + int( jobinfo['poll_interval'] ) )
+
                                 if not jobid in self.jobs_to_store:
                                         self.jobs_to_store.append( jobid )
@@ -478 +487 @@
                 debug_msg( 1, printTime() + ' - torquexmlthread(): Done storing.' )
 
+                self.jobs_processed = [ ]
                 self.jobs_to_store = [ ]