Changeset 68

Timestamp:

04/14/05 14:26:47 (19 years ago)

Author:

bastiaans

Message:

plugin/togap.py:

• Removed global heartbeat
• Added 'reported' time to each jobinfo
• Misc. code cleanup

File:

• trunk/plugin/togap.py (modified) (14 diffs)

trunk/plugin/togap.py

@@ -15 +15 @@
 #
 TORQUE_POLL_INTERVAL = 10
+
+# Alternate location of gmond.conf
+#
+# Default: /etc/gmond.conf
+#
+#GMOND_CONF = '/etc/gmond.conf'
 
 from PBSQuery import PBSQuery
@@ -24 +30 @@
 
 class DataProcessor:
+        """Class for processing of data"""
 
         binary = '/usr/bin/gmetric'
 
         def __init__( self, binary=None ):
+                """Remember alternate binary location if supplied"""
 
                 if binary:
@@ -34 +42 @@
                 self.dmax = TORQUE_POLL_INTERVAL
 
-                #incompatible = self.checkGmetricVersion
+                try:
+                        gmond_file = GMOND_CONF
+
+                except NameError:
+                        gmond_file = '/etc/gmond.conf'
+
+                if not os.path.exists( gmond_file ):
+                        debug_msg( 0, gmond_file + ' does not exist' )
+                        sys.exit( 1 )
+
+                #incompatible = self.checkGmetricVersion()
                 incompatible = 0
 
@@ -42 +60 @@
 
         def checkGmetricVersion( self ):
+                """
+                Check version of gmetric is at least 3.0.1
+                for the syntax we use
+                """
 
                 for line in os.popen( self.binary + ' --version' ).readlines():
@@ -72 +94 @@
 
         def multicastGmetric( self, metricname, metricval, valtype='string', tmax='15' ):
+                """Call gmetric binary and multicast"""
 
                 cmd = self.binary
@@ -90 +113 @@
 
         def __init__( self ):
+                """Setup appropriate variables"""
 
                 self.pq = PBSQuery()
@@ -96 +120 @@
 
         def getAttr( self, attrs, name ):
+                """Return certain attribute from dictionary, if exists"""
 
                 if attrs.has_key( name ):
@@ -103 +128 @@
 
         def jobDataChanged( self, jobs, job_id, attrs ):
+                """Check if job with attrs and job_id in jobs has changed"""
 
                 if jobs.has_key( job_id ):
@@ -123 +149 @@
 
         def getJobData( self, known_jobs ):
+                """Gather all data on current jobs in Torque"""
 
                 if len( known_jobs ) > 0:
@@ -130 +157 @@
 
                 joblist = self.pq.getjobs()
+
+                cur_time = time.time()
 
                 jobs_processed = [ ]
@@ -172 +201 @@
                         myAttrs['status'] = status
                         myAttrs['start_timestamp'] = start_timestamp
+                        myAttrs['reported_timestamp'] = str( int( cur_time ) )
                         myAttrs['nodes'] = nodeslist
                         myAttrs['domain'] = string.join( socket.getfqdn().split( '.' )[1:], '.' )
@@ -186 +216 @@
         def submitJobData( self, jobs ):
                 """Submit job info list"""
-
-                time_now = time.time()
-
-                self.dp.multicastGmetric( 'TOGA-HEARTBEAT', str( time_now ), 'float' )
 
                 # Now let's spread the knowledge
@@ -201 +227 @@
 
         def makeNodeString( self, nodelist ):
+                """Make one big string of all hosts"""
 
                 node_str = None
@@ -223 +250 @@
                 status_str = 'status=' + jobattrs['status']
                 stime_str = 'stime=' + jobattrs['start_timestamp']
+                reported_str = 'reported=' + jobattrs['reported_timestamp']
                 domain_str = 'domain=' + jobattrs['domain']
                 node_str = 'nodes=' + self.makeNodeString( jobattrs['nodes'] )
 
-                appendList = [ name_str, queue_str, owner_str, rtime_str, rmem_str, ppn_str, status_str, stime_str, domain_str, node_str ]
+                appendList = [ name_str, queue_str, owner_str, rtime_str, rmem_str, ppn_str, status_str, stime_str, reported_str, domain_str, node_str ]
 
                 return self.makeAppendLists( appendList )
 
         def makeAppendLists( self, append_list ):
+                """
+                Divide all values from append_list over strings with a maximum
+                size of 1400
+                """
 
                 app_lists = [ ]