Changeset 256 for trunk/jobmond/jobmond.py

Timestamp:

06/22/06 14:53:16 (17 years ago)

Author:

bastiaans

Message:

jobmond/jobmond.conf, jobmond/examples/lisa_production.conf, jobmond/examples/lisa_test.conf:

• changed: TORQUE_SERVER is now BATCH_SERVER
• changed: TORQUE_POLL_INTERVAL is now BATCH_POLL_INTERVAL
• added: BATCH_API to select which api to use for batch system polling

jobmond/jobmond.py:

• changed DataGatherer? to PbsDataGatherer?
• changed creation of gather() object: will now select appropriate module and gatherer for each BATCH_API that is supported

File:

• trunk/jobmond/jobmond.py (modified) (10 diffs)

trunk/jobmond/jobmond.py

@@ -90 +90 @@
         cfg.read( filename )
 
-        global DEBUG_LEVEL, DAEMONIZE, TORQUE_SERVER, TORQUE_POLL_INTERVAL, GMOND_CONF, DETECT_TIME_DIFFS, BATCH_HOST_TRANSLATE
+        global DEBUG_LEVEL, DAEMONIZE, BATCH_SERVER, BATCH_POLL_INTERVAL, GMOND_CONF, DETECT_TIME_DIFFS, BATCH_HOST_TRANSLATE, BATCH_API
 
         DEBUG_LEVEL = cfg.getint( 'DEFAULT', 'DEBUG_LEVEL' )
@@ -96 +96 @@
         DAEMONIZE = cfg.getboolean( 'DEFAULT', 'DAEMONIZE' )
 
-        TORQUE_SERVER = cfg.get( 'DEFAULT', 'TORQUE_SERVER' )
-
-        TORQUE_POLL_INTERVAL = cfg.getint( 'DEFAULT', 'TORQUE_POLL_INTERVAL' )
+        BATCH_SERVER = cfg.get( 'DEFAULT', 'BATCH_SERVER' )
+
+        BATCH_POLL_INTERVAL = cfg.getint( 'DEFAULT', 'BATCH_POLL_INTERVAL' )
 
         GMOND_CONF = cfg.get( 'DEFAULT', 'GMOND_CONF' )
@@ -106 +106 @@
         BATCH_HOST_TRANSLATE = getlist( cfg.get( 'DEFAULT', 'BATCH_HOST_TRANSLATE' ) )
 
+        BATCH_API = cfg.get( 'DEFAULT', 'BATCH_API' )
+
         return True
 
-from PBSQuery import PBSQuery
 
 import time, os, socket, string, re
@@ -132 +133 @@
                 # DMAX=0 means eternal life.'
 
-                self.dmax = str( int( int( TORQUE_POLL_INTERVAL ) * 2 ) )
+                self.dmax = str( int( int( BATCH_POLL_INTERVAL ) * 2 ) )
 
                 try:
@@ -209 +210 @@
                 os.system( cmd )
 
-class DataGatherer:
+class SgeDataGatherer:
+
+        """Placeholder for Babu Sundaram's SGE implementation"""
+
+        def daemon( self ):
+
+                pass
+
+        def run( self ):
+
+                pass
+
+class PbsDataGatherer:
+
+        """This is the DataGatherer for PBS and Torque"""
 
         jobs = { }
+
+        global PBSQuery
 
         def __init__( self ):
@@ -224 +241 @@
 
                 self.pq = None
-                if( TORQUE_SERVER ):
-                        self.pq = PBSQuery( TORQUE_SERVER )
+                if( BATCH_SERVER ):
+                        self.pq = PBSQuery( BATCH_SERVER )
                 else:
                         self.pq = PBSQuery()
@@ -373 +390 @@
                         myAttrs['nodes'] = nodeslist
                         myAttrs['domain'] = string.join( socket.getfqdn().split( '.' )[1:], '.' )
-                        myAttrs['poll_interval'] = str( TORQUE_POLL_INTERVAL )
+                        myAttrs['poll_interval'] = str( BATCH_POLL_INTERVAL )
 
                         if self.jobDataChanged( jobs, job_id, myAttrs ) and myAttrs['status'] in [ 'R', 'Q' ]:
@@ -534 +551 @@
                         self.jobs = self.getJobData( self.jobs )
                         self.submitJobData( self.jobs )
-                        time.sleep( TORQUE_POLL_INTERVAL )      
+                        time.sleep( BATCH_POLL_INTERVAL )       
 
 def printTime( ):
@@ -550 +567 @@
         """Application start"""
 
+        global PBSQuery
+
         if not processArgs( sys.argv[1:] ):
                 sys.exit( 1 )
 
-        gather = DataGatherer()
+        if BATCH_API == 'pbs':
+
+                try:
+                        from PBSQuery import PBSQuery
+
+                except ImportError:
+
+                        debug_msg( 0, "fatal error: BATCH_API set to 'pbs' but python module 'pbs_python' is not installed" )
+                        sys.exit( 1 )
+
+                gather = PbsDataGatherer()
+
+        elif BATCH_API == 'sge':
+
+                pass
+                # import Babu's code here
+                #
+                #try:
+                #       import sge_drmaa
+                #
+                #except ImportError:
+                #
+                #       debug_msg( 0, "fatal error: BATCH_API set to 'pbs' but python module 'pbs_python' is not installed' )
+                #       sys.exit( 1 )
+                #
+                #gather = SgeDataGatherer()
+
+        else:
+                debug_msg( 0, "fatal error: unknown BATCH_API '" + BATCH_API + "' is not supported" )
+                sys.exit( 1 )
+
         if DAEMONIZE:
                 gather.daemon()
@@ -559 +608 @@
                 gather.run()
 
-# w00t someone started me
+# wh00t? someone started me! :)
 #
 if __name__ == '__main__':