Changeset 87 for trunk

Timestamp:

04/18/05 16:46:55 (18 years ago)

Author:

bastiaans

Message:

daemon/togad.py:

• Misc code cleanup and optimizing

File:

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

trunk/daemon/togad.py

@@ -20 +20 @@
 # 9  = RRD activity, gmetad config parsing
 # 8  = RRD file activity
-# 7  = daemon threading
 # 6  = SQL
+# 1  = daemon threading
 #
 DEBUG_LEVEL = 7
@@ -219 +219 @@
                         ids = self.getNodeIds( node_list )
 
-                        self.addJobNodes( self. job_id, ids )
+                        self.addJobNodes( job_id, ids )
                 elif action == 'update':
 
@@ -370 +370 @@
                 self.myXMLHandler = TorqueXMLHandler()
                 self.myXMLError = XMLErrorHandler()
+                self.config = GangliaConfigParser( GMETAD_CONF )
 
         def run( self ):
                 """Main XML processing"""
 
+                debug_msg( 5, printTime() + ' - torquexmlthread(): started.' )
+
                 while( 1 ):
 
-                        print 'parse'
                         self.myXMLSource = self.myXMLGatherer.getFileObject()
+                        debug_msg( 1, printTime() + ' - torquexmlthread(): Parsing..' )
                         xml.sax.parse( self.myXMLSource, self.myXMLHandler, self.myXMLError )
-                        print 'sleep'
-                        time.sleep( 1 )
+                        debug_msg( 1, printTime() + ' - torquexmlthread(): Done parsing.' )
+                        debug_msg( 1, printTime() + ' - torquexmlthread(): Sleeping.. (%ss)' %(str( self.config.getLowestInterval() ) ) )
+                        time.sleep( self.config.getLowestInterval() )
 
 class TorqueXMLHandler( xml.sax.handler.ContentHandler ):
@@ -457 +461 @@
                         # it must have finished, since we _did_ get a new heartbeat
                         #
-                        if jobinfo['reported'] < self.heartbeat:
+                        if jobinfo['reported'] < self.heartbeat and jobinfo['status'] == 'R' and jobid not in self.jobs_to_store:
 
                                 self.jobAttrs[ jobid ]['status'] = 'F'
@@ -464 +468 @@
                                         self.jobs_to_store.append( jobid )
 
+                debug_msg( 1, printTime() + ' - torquexmlthread(): Storing..' )
+
                 for jobid in self.jobs_to_store:
                         self.ds.storeJobInfo( jobid, self.jobAttrs[ jobid ] )   
+
+                debug_msg( 1, printTime() + ' - torquexmlthread(): Done storing.' )
 
                 self.jobs_to_store = [ ]
@@ -488 +496 @@
                 """
 
+                ignore_changes = [ 'reported' ]
+
                 if jobattrs.has_key( jobid ):
 
                         for valname, value in jobinfo.items():
 
-                                if jobattrs[ jobid ].has_key( valname ):
-
-                                        if value != jobattrs[ jobid ][ valname ]:
-
-                                                if jobinfo['reported'] > jobattrs[ jobid ][ 'reported' ] and jobinfo['reported'] == self.heartbeat:
-                                                        return 1
-
-                                else:
-                                        return 1
+                                if valname not in ignore_changes:
+
+                                        if jobattrs[ jobid ].has_key( valname ):
+
+                                                if value != jobattrs[ jobid ][ valname ]:
+
+                                                        if jobinfo['reported'] > jobattrs[ jobid ][ 'reported' ] and jobinfo['reported'] == self.heartbeat:
+                                                                return 1
+
+                                        else:
+                                                return 1
 
                 return 0
@@ -776 +788 @@
                 """Actual metric storing thread"""
 
-                debug_msg( 7, printTime() + ' - storemetricthread(): started.' )
-                debug_msg( 7, printTime() + ' - storemetricthread(): Storing data..' )
+                debug_msg( 1, printTime() + ' - storemetricthread(): started.' )
+                debug_msg( 1, printTime() + ' - storemetricthread(): Storing data..' )
                 ret = self.myXMLHandler.storeMetrics()
-                debug_msg( 7, printTime() + ' - storemetricthread(): Done storing.' )
-                debug_msg( 7, printTime() + ' - storemetricthread(): finished.' )
+                debug_msg( 1, printTime() + ' - storemetricthread(): Done storing.' )
+                debug_msg( 1, printTime() + ' - storemetricthread(): finished.' )
                 
                 return ret
@@ -787 +799 @@
                 """Process XML"""
 
-                debug_msg( 7, printTime() + ' - xmlthread(): started.' )
+                debug_msg( 1, printTime() + ' - xmlthread(): started.' )
 
                 parsethread = threading.Thread( None, self.parseThread, 'parsethread' )
                 parsethread.start()
 
-                debug_msg( 7, printTime() + ' - xmlthread(): Sleeping.. (%ss)' %self.config.getLowestInterval() )
+                debug_msg( 1, printTime() + ' - xmlthread(): Sleeping.. (%ss)' %self.config.getLowestInterval() )
                 time.sleep( float( self.config.getLowestInterval() ) )  
-                debug_msg( 7, printTime() + ' - xmlthread(): Done sleeping.' )
+                debug_msg( 1, printTime() + ' - xmlthread(): Done sleeping.' )
 
                 if parsethread.isAlive():
 
-                        debug_msg( 7, printTime() + ' - xmlthread(): parsethread() still running, waiting to finish..' )
+                        debug_msg( 1, printTime() + ' - xmlthread(): parsethread() still running, waiting to finish..' )
                         parsethread.join( PARSE_TIMEOUT ) # Maximum time for XML thread to finish
                         debug_msg( 7, printTime() + ' - xmlthread(): Done waiting.' )
 
-                debug_msg( 7, printTime() + ' - xmlthread(): finished.' )
+                debug_msg( 1, printTime() + ' - xmlthread(): finished.' )
 
                 return 0
@@ -809 +821 @@
                 """Actual parsing thread"""
 
-                debug_msg( 7, printTime() + ' - parsethread(): started.' )
-                debug_msg( 7, printTime() + ' - parsethread(): Parsing XML..' )
+                debug_msg( 1, printTime() + ' - parsethread(): started.' )
+                debug_msg( 1, printTime() + ' - parsethread(): Parsing XML..' )
                 self.myXMLSource = self.myXMLGatherer.getFileObject()
                 ret = xml.sax.parse( self.myXMLSource, self.myXMLHandler, self.myXMLError )
-                debug_msg( 7, printTime() + ' - parsethread(): Done parsing.' )
-                debug_msg( 7, printTime() + ' - parsethread(): finished.' )
+                debug_msg( 1, printTime() + ' - parsethread(): Done parsing.' )
+                debug_msg( 1, printTime() + ' - parsethread(): finished.' )
 
                 return ret
@@ -1264 +1276 @@
 
         myTProcessor = TorqueXMLProcessor()
-        myTProcessor.run()
-
-        sys.exit( 1 )
-
         myGProcessor = GangliaXMLProcessor()
 
@@ -1278 +1286 @@
 
         torquexmlthread.start()
-        #gangliaxmlthread.start()
+        gangliaxmlthread.start()
 
 # Global functions