Changeset 785 for branches/0.4/jobmond/jobmond.py

Timestamp:

04/04/13 16:05:42 (10 years ago)

Author:

ramonb

Message:

• cleanup

File:

• branches/0.4/jobmond/jobmond.py (modified) (14 diffs)

branches/0.4/jobmond/jobmond.py

@@ -1517 +1517 @@
         """Setup appropriate variables"""
 
-        self.jobs    = { }
-        self.timeoffset    = 0
-        self.dp        = DataProcessor()
+        self.jobs       = { }
+        self.timeoffset = 0
+        self.dp         = DataProcessor()
 
         self.initPbsQuery()
@@ -1525 +1525 @@
     def initPbsQuery( self ):
 
-        self.pq        = None
+        self.pq = None
 
         if( BATCH_SERVER ):
 
-            self.pq        = PBSQuery( BATCH_SERVER )
+            self.pq = PBSQuery( BATCH_SERVER )
         else:
-            self.pq        = PBSQuery()
+            self.pq = PBSQuery()
 
         try:
@@ -1546 +1546 @@
         """Gather all data on current jobs in Torque"""
 
-        joblist        = {}
-        self.cur_time    = 0
+        joblist            = {}
+        self.cur_time      = 0
 
         try:
             joblist        = self.pq.getjobs()
-            self.cur_time    = time.time()
+            self.cur_time  = time.time()
 
         except PBSError, detail:
@@ -1561 +1561 @@
 
         for name, attrs in joblist.items():
-            display_queue        = 1
-            job_id            = name.split( '.' )[0]
-
-            name            = self.getAttr( attrs, 'Job_Name' )
-            queue            = self.getAttr( attrs, 'queue' )
+            display_queue = 1
+            job_id        = name.split( '.' )[0]
+
+            name          = self.getAttr( attrs, 'Job_Name' )
+            queue         = self.getAttr( attrs, 'queue' )
 
             if QUEUE:
@@ -1580 +1580 @@
 
             owner            = self.getAttr( attrs, 'Job_Owner' ).split( '@' )[0]
-            requested_time        = self.getAttr( attrs, 'Resource_List.walltime' )
-            requested_memory    = self.getAttr( attrs, 'Resource_List.mem' )
-
-            mynoderequest        = self.getAttr( attrs, 'Resource_List.nodes' )
-
-            ppn            = ''
+            requested_time   = self.getAttr( attrs, 'Resource_List.walltime' )
+            requested_memory = self.getAttr( attrs, 'Resource_List.mem' )
+
+            mynoderequest    = self.getAttr( attrs, 'Resource_List.nodes' )
+
+            ppn = ''
 
             if mynoderequest.find( ':' ) != -1 and mynoderequest.find( 'ppn' ) != -1:
 
-                mynoderequest_fields    = mynoderequest.split( ':' )
+                mynoderequest_fields = mynoderequest.split( ':' )
 
                 for mynoderequest_field in mynoderequest_fields:
@@ -1595 +1595 @@
                     if mynoderequest_field.find( 'ppn' ) != -1:
 
-                        ppn    = mynoderequest_field.split( 'ppn=' )[1]
-
-            status            = self.getAttr( attrs, 'job_state' )
+                        ppn = mynoderequest_field.split( 'ppn=' )[1]
+
+            status = self.getAttr( attrs, 'job_state' )
 
             if status in [ 'Q', 'R' ]:
@@ -1603 +1603 @@
                 jobs_processed.append( job_id )
 
-            queued_timestamp    = self.getAttr( attrs, 'ctime' )
+            queued_timestamp = self.getAttr( attrs, 'ctime' )
 
             if status == 'R':
 
-                start_timestamp        = self.getAttr( attrs, 'mtime' )
-                nodes            = self.getAttr( attrs, 'exec_host' ).split( '+' )
-
-                nodeslist        = do_nodelist( nodes )
+                start_timestamp = self.getAttr( attrs, 'mtime' )
+                nodes           = self.getAttr( attrs, 'exec_host' ).split( '+' )
+
+                nodeslist       = do_nodelist( nodes )
 
                 if DETECT_TIME_DIFFS:
@@ -1620 +1620 @@
                     if int( start_timestamp ) > int( int( self.cur_time ) + int( self.timeoffset ) ):
 
-                        self.timeoffset    = int( int(start_timestamp) - int(self.cur_time) )
+                        self.timeoffset = int( int(start_timestamp) - int(self.cur_time) )
 
             elif status == 'Q':
@@ -1636 +1636 @@
                 #
 
-                start_timestamp        = ''
-                count_mynodes        = 0
+                start_timestamp = ''
+                count_mynodes   = 0
 
                 for node in mynoderequest.split( '+' ):
@@ -1643 +1643 @@
                     # Just grab the {node_count|hostname} part and ignore properties
                     #
-                    nodepart    = node.split( ':' )[0]
+                    nodepart     = node.split( ':' )[0]
 
                     # Let's assume a node_count value
                     #
-                    numeric_node    = 1
+                    numeric_node = 1
 
                     # Chop the value up into characters
@@ -1657 +1657 @@
                         if letter not in string.digits:
 
-                            numeric_node    = 0
+                            numeric_node = 0
 
                     # If this is a hostname, just count this as one (1) node
@@ -1663 +1663 @@
                     if not numeric_node:
 
-                        count_mynodes    = count_mynodes + 1
+                        count_mynodes = count_mynodes + 1
                     else:
 
@@ -1670 +1670 @@
                         #
                         try:
-                            count_mynodes    = count_mynodes + int( nodepart )
+                            count_mynodes = count_mynodes + int( nodepart )
 
                         except ValueError, detail:
@@ -1683 +1683 @@
                             debug_msg( 10, 'attrs = ' + str( attrs ) )
                         
-                nodeslist    = str( count_mynodes )
+                nodeslist       = str( count_mynodes )
             else:
-                start_timestamp    = ''
-                nodeslist    = ''
+                start_timestamp = ''
+                nodeslist       = ''
 
             myAttrs                = { }
 
-            myAttrs[ 'name' ]        = str( name )
-            myAttrs[ 'queue' ]        = str( queue )
-            myAttrs[ 'owner' ]        = str( owner )
-            myAttrs[ 'requested_time' ]    = str( requested_time )
-            myAttrs[ 'requested_memory' ]    = str( requested_memory )
-            myAttrs[ 'ppn' ]        = str( ppn )
-            myAttrs[ 'status' ]        = str( status )
-            myAttrs[ 'start_timestamp' ]    = str( start_timestamp )
-            myAttrs[ 'queued_timestamp' ]    = str( queued_timestamp )
-            myAttrs[ 'reported' ]        = str( int( int( self.cur_time ) + int( self.timeoffset ) ) )
-            myAttrs[ 'nodes' ]        = nodeslist
-            myAttrs[ 'domain' ]        = fqdn_parts( socket.getfqdn() )[1]
+            myAttrs[ 'name' ]             = str( name )
+            myAttrs[ 'queue' ]            = str( queue )
+            myAttrs[ 'owner' ]            = str( owner )
+            myAttrs[ 'requested_time' ]   = str( requested_time )
+            myAttrs[ 'requested_memory' ] = str( requested_memory )
+            myAttrs[ 'ppn' ]              = str( ppn )
+            myAttrs[ 'status' ]           = str( status )
+            myAttrs[ 'start_timestamp' ]  = str( start_timestamp )
+            myAttrs[ 'queued_timestamp' ] = str( queued_timestamp )
+            myAttrs[ 'reported' ]         = str( int( int( self.cur_time ) + int( self.timeoffset ) ) )
+            myAttrs[ 'nodes' ]            = nodeslist
+            myAttrs[ 'domain' ]           = fqdn_parts( socket.getfqdn() )[1]
             myAttrs[ 'poll_interval' ]    = str( BATCH_POLL_INTERVAL )
 
             if self.jobDataChanged( self.jobs, job_id, myAttrs ) and myAttrs['status'] in [ 'R', 'Q' ]:
 
-                self.jobs[ job_id ]    = myAttrs
+                self.jobs[ job_id ] = myAttrs
 
         for id, attrs in self.jobs.items():