Changeset 317 for trunk/jobmond

Timestamp:

04/18/07 15:49:27 (16 years ago)

Author:

bastiaans

Message:

jobmond/jobmond.conf:

• added QUEUE option

jobmond/jobmond.py:

• implemented QUEUE option (thanks to Michael Jeanson)

Location:

trunk/jobmond

Files:

• jobmond.conf (modified) (2 diffs)
• jobmond.py (modified) (3 diffs)

trunk/jobmond/jobmond.conf

@@ -12 +12 @@
 # What Batch type is the system
 # 
-# Currently supported: pbs, sge
+# Currently supported: pbs, sge (experimental)
 #
 BATCH_API               : pbs
@@ -19 +19 @@
 #
 BATCH_SERVER            : localhost
+
+# Which queue(s) to report jobs of
+# (optional and only supported for pbs)
+#
+#QUEUE                  : long, short
 
 # How many seconds interval for polling of jobs

trunk/jobmond/jobmond.py

@@ -109 +109 @@
         cfg.read( filename )
 
-        global DEBUG_LEVEL, DAEMONIZE, BATCH_SERVER, BATCH_POLL_INTERVAL, GMOND_CONF, DETECT_TIME_DIFFS, BATCH_HOST_TRANSLATE, BATCH_API
+        global DEBUG_LEVEL, DAEMONIZE, BATCH_SERVER, BATCH_POLL_INTERVAL, GMOND_CONF, DETECT_TIME_DIFFS, BATCH_HOST_TRANSLATE, BATCH_API, QUEUE
 
         DEBUG_LEVEL = cfg.getint( 'DEFAULT', 'DEBUG_LEVEL' )
@@ -156 +156 @@
                         debug_msg( 0, "fatal error: BATCH_API not set and can't make guess" )
                         sys.exit( 1 )
+
+        try:
+
+                QUEUE = cfg.getlist( 'DEFAULT', 'QUEUE' )
+
+        except ConfigParser.NoOptionError, detail:
+
+                QUEUE = None
         
         return True
@@ -357 +365 @@
                         name = self.getAttr( attrs, 'Job_Name' )
                         queue = self.getAttr( attrs, 'queue' )
+
+                        if QUEUE:
+
+                                if QUEUE != queue:
+
+                                        continue
+
                         owner = self.getAttr( attrs, 'Job_Owner' ).split( '@' )[0]
                         requested_time = self.getAttr( attrs, 'Resource_List.walltime' )