Changeset 67

Timestamp:

04/14/05 12:53:04 (18 years ago)

Author:

bastiaans

Message:

plugin/togap.py:

• Added domain name parsing
• Added nodelist parsing

File:

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

trunk/plugin/togap.py

@@ -20 +20 @@
 import time
 import os
+import socket
 import string
 
@@ -133 +134 @@
 
                 for name, attrs in joblist.items():
+
+                        print attrs
 
                         job_id = name.split( '.' )[0]
@@ -150 +153 @@
                         status = self.getAttr( attrs, 'job_state' )
                         start_timestamp = self.getAttr( attrs, 'mtime' )
-                        #stop_timestamp = ''
+
+                        nodes = self.getAttr( attrs, 'exec_host' ).split( '+' )
+                        nodeslist = [ ]
+
+                        for node in nodes:
+                                host = node.split( '/' )[0]
+
+                                if nodeslist.count( host ) == 0:
+                                        nodeslist.append( node.split( '/' )[0] )
 
                         myAttrs = { }
@@ -161 +172 @@
                         myAttrs['status'] = status
                         myAttrs['start_timestamp'] = start_timestamp
-                        #myAttrs['stop_timestamp'] = stop_timestamp
+                        myAttrs['nodes'] = nodeslist
+                        myAttrs['domain'] = string.join( socket.getfqdn().split( '.' )[1:], '.' )
 
                         if self.jobDataChanged( jobs, job_id, myAttrs ):
@@ -169 +181 @@
 
                                 debug_msg( 10, printTime() + ' job %s state changed' %(job_id) )
-
-                #for id, attrs in jobs.items():
-
-                #       # This job was there in the last run, and not anymore
-                #       # it must have finished
-
-                #       if id not in jobs_processed and attrs['stop_timestamp'] == '':
-
-                #               jobs[ id ]['status'] = 'F'
-                #               jobs[ id ]['stop_timestamp'] = time.time()
-                #               debug_msg( 10, printTime() + ' job %s finished' %(id) )
-                #               self.printJob( jobs, id )
 
                 return jobs
@@ -199 +199 @@
                         for val in gmetric_val:
                                 self.dp.multicastGmetric( 'TOGA-JOB-' + jobid, val )
+
+        def makeNodeString( self, nodelist ):
+
+                node_str = None
+
+                for node in nodelist:
+                        if not node_str:
+                                node_str = node
+                        else:
+                                node_str = node_str + ';' + node
+
+                return node_str
 
         def compileGmetricVal( self, jobid, jobattrs ):
@@ -211 +223 @@
                 status_str = 'status=' + jobattrs['status']
                 stime_str = 'stime=' + jobattrs['start_timestamp']
-
-                appendList = [ name_str, queue_str, owner_str, rtime_str, rmem_str, ppn_str, status_str, stime_str ]
+                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 ]
 
                 return self.makeAppendLists( appendList )