Changeset 514 for trunk/jobmond

Timestamp:

03/08/08 21:16:32 (16 years ago)

Author:

bastiaans

Message:

jobmond/jobmond.py:

• added report time to down/offline nodes
• added domain name to down/offline nodes

web/addons/job_monarch/libtoga.php:

• incorporate down/offline node status in ClusterImage?

File:

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

trunk/jobmond/jobmond.py

@@ -490 +490 @@
                 if BATCH_API == 'pbs':
 
+                        domain          = fqdn_parts( socket.getfqdn() )[1]
+
                         downed_nodes    = list()
                         offline_nodes   = list()
@@ -505 +507 @@
                                         offline_nodes.append( name )
 
-                        self.dp.multicastGmetric( 'MONARCH-DOWN'   , string.join( downed_nodes,  ',' ) )
-                        self.dp.multicastGmetric( 'MONARCH-OFFLINE', string.join( offline_nodes, ',' ) )
+                        downnodeslist           = do_nodelist( downed_nodes )
+                        offlinenodeslist        = do_nodelist( offline_nodes )
+
+                        down_str        = 'nodes=%s domain=%s reported=%s' %( string.join( downnodeslist, ';' ), domain, str( int( int( self.cur_time ) + int( self.timeoffset ) ) ) )
+                        offl_str        = 'nodes=%s domain=%s reported=%s' %( string.join( offlinenodeslist, ';' ), domain, str( int( int( self.cur_time ) + int( self.timeoffset ) ) ) )
+                        self.dp.multicastGmetric( 'MONARCH-DOWN'   , down_str )
+                        self.dp.multicastGmetric( 'MONARCH-OFFLINE', offl_str )
 
                 # Now let's spread the knowledge