Changeset 469 for trunk

Timestamp:

02/21/08 16:57:37 (16 years ago)

Author:

bastiaans

Message:

jobarchived/jobarchived.py:

• bugfix: #34: make sure parseThreads return(s) correctly when datasource is unavailable
• set default timeout for socket connections to gmetad's default update interval minus 1

File:

• trunk/jobarchived/jobarchived.py (modified) (11 diffs)

trunk/jobarchived/jobarchived.py

@@ -78 +78 @@
                 if opt in [ '--help', '-h' ]:
 
-                        usage( false )
+                        usage( False )
                         sys.exit( 0 )
 
                 if opt in [ '--version', '-v' ]:
 
-                        usage( true )
+                        usage( True )
                         sys.exit( 0 )
 
@@ -149 +149 @@
 
         try:
+                global rrdtool
                 import rrdtool
 
@@ -628 +629 @@
         binary = None
 
-
         def __init__( self, binary=None ):
                 """Set alternate binary if supplied"""
@@ -791 +791 @@
 
                         #self.myXMLSource = self.mXMLGatherer.getFileObject()
-                        debug_msg( 1, 'torque_xml_thread(): Parsing..' )
+                        debug_msg( 1, 'torque_xml_thread(): Retrieving XML data..' )
 
                         my_data = self.myXMLSource.getData()
 
-                        try:
+                        debug_msg( 1, 'torque_xml_thread(): Done retrieving.' )
+
+                        if my_data:
+                                debug_msg( 1, 'ganglia_parse_thread(): Parsing XML..' )
+
                                 xml.sax.parseString( my_data, self.myXMLHandler, self.myXMLError )
-                        except socket.error, msg:
-                                debug_msg( 0, 'ERROR: Socket error in connect to datasource!: %s' %msg )
+
+                                debug_msg( 1, 'ganglia_parse_thread(): Done parsing.' )
                                 
-                        debug_msg( 1, 'torque_xml_thread(): Done parsing.' )
                         debug_msg( 1, 'torque_xml_thread(): Sleeping.. (%ss)' %(str( self.config.getLowestInterval() ) ) )
                         time.sleep( self.config.getLowestInterval() )
@@ -1161 +1164 @@
                 self.slot.acquire()
 
+                self.data       = None
+
                 for res in socket.getaddrinfo( self.host, self.port, socket.AF_UNSPEC, socket.SOCK_STREAM ):
 
@@ -1169 +1174 @@
                                 self.s = socket.socket( af, socktype, proto )
 
-                        except socket.error, msg:
+                        except ( socket.error, socket.gaierror, socket.herror, socket.timeout ), msg:
 
                                 self.s = None
@@ -1178 +1183 @@
                                 self.s.connect( sa )
 
-                        except socket.error, msg:
+                        except ( socket.error, socket.gaierror, socket.herror, socket.timeout ), msg:
 
                                 self.disconnect()
@@ -1189 +1194 @@
                         debug_msg( 0, 'FATAL ERROR: Could not open socket or unable to connect to datasource!' )
                         self.update_now = False
-                        sys.exit( 1 )
+                        #sys.exit( 1 )
 
                 else:
@@ -1402 +1407 @@
 
                 debug_msg( 1, 'ganglia_parse_thread(): started.' )
-                debug_msg( 1, 'ganglia_parse_thread(): Parsing XML..' )
-                #self.myXMLSource = self.myXMLGatherer.getFileObject()
+                debug_msg( 1, 'ganglia_parse_thread(): Retrieving XML data..' )
                 
                 my_data = self.myXMLSource.getData()
 
-                #print my_data
-
-                try:
+                debug_msg( 1, 'ganglia_parse_thread(): Done retrieving.' )
+
+                if my_data:
+                        debug_msg( 1, 'ganglia_parse_thread(): Parsing XML..' )
                         xml.sax.parseString( my_data, self.myXMLHandler, self.myXMLError )
-                except socket.error, msg:
-                        debug_msg( 0, 'ERROR: Socket error in connect to datasource!: %s' %msg )
-
-                debug_msg( 1, 'ganglia_parse_thread(): Done parsing.' )
+                        debug_msg( 1, 'ganglia_parse_thread(): Done parsing.' )
+
                 debug_msg( 1, 'ganglia_parse_thread(): finished.' )
 
@@ -1960 +1963 @@
 def run():
         """Threading start"""
+
+        config          = GangliaConfigParser( GMETAD_CONF )
+        s_timeout       = int( config.getLowestInterval() - 1 )
+
+        socket.setdefaulttimeout( s_timeout )
 
         myXMLSource             = XMLGatherer( ARCHIVE_XMLSOURCE.split( ':' )[0], ARCHIVE_XMLSOURCE.split( ':' )[1] )
@@ -2046 +2054 @@
 
 # Ooohh, someone started me! Let's go..
+#
 if __name__ == '__main__':
         main()