Changeset 44 for trunk

Timestamp:

04/06/05 14:02:15 (18 years ago)

Author:

bastiaans

Message:

daemon/togad.py:

• Grabbing of last serials and updates of existing .rrds will now be done on application boot instead of from the parsing thread. Calling from parsing thread caused XML parsing errors because of the time needed.
• Also replaced os.walk with os.listdir, we don't need a recursive dirlist, just the root list

File:

• trunk/daemon/togad.py (modified) (8 diffs)

trunk/daemon/togad.py

@@ -23 +23 @@
 # 7  = daemon threading
 #
-DEBUG_LEVEL = 7
+DEBUG_LEVEL = 8
 
 # Where is the gmetad.conf located
@@ -124 +124 @@
                 self.config = config
                 self.clusters = { }
+                self.gatherClusters()
+
+        def gatherClusters( self ):
+
+                archive_dir = '%s/%s' %( check_dir(ARCHIVE_PATH), self.cluster )
+
+                hosts = [ ]
+
+                if os.path.exists( archive_dir ):
+
+                        dirlist = os.listdir( archive_dir )
+
+                        for item in dirlist:
+
+                                clustername = item
+
+                                if not self.clusters.has_key( clustername ) and clustername in ARCHIVE_SOURCES:
+
+                                        self.clusters[ clustername ] = RRDHandler( self.config, clustername )
 
         def startElement( self, name, attrs ):
@@ -348 +367 @@
                 # Store metrics somewhere between every 60 and 180 seconds
                 #
-                STORE_INTERVAL = random.randint( 60, 180 )
-                #STORE_INTERVAL = 30
+                #STORE_INTERVAL = random.randint( 360, 640 )
+                STORE_INTERVAL = 16
 
                 storethread = threading.Thread( None, self.storeThread, 'storemetricthread' )
@@ -489 +508 @@
 
         def __init__( self, config, cluster ):
+                self.block = 0
                 self.cluster = cluster
                 self.config = config
@@ -495 +515 @@
                 self.gatherLastUpdates()
 
+        def isBlocking( self ):
+
+                return self.block
+
         def gatherLastUpdates( self ):
                 "Populate the lastStored list, containing timestamps of all last updates"
 
+                self.block = 1
+
                 cluster_dir = '%s/%s' %( check_dir(ARCHIVE_PATH), self.cluster )
 
@@ -504 +530 @@
                 if os.path.exists( cluster_dir ):
 
-                        for root, dirs, files in os.walk( cluster_dir ):
-
-                                for dir in dirs:
-
-                                        valid_dir = 1
-
-                                        for letter in dir:
-                                                if letter not in string.digits:
-                                                        valid_dir = 0
-
-                                        if valid_dir:
-                                                host = root.split( '/' )[-1]
-                                                hosts.append( host )
+                        dirlist = os.listdir( cluster_dir )
+
+                        for dir in dirlist:
+
+                                hosts.append( dir )
 
                 for host in hosts:
@@ -526 +544 @@
                                 if os.path.exists( metric_dir ):
 
-                                        for root, dirs, files in os.walk( metric_dir ):
-
-                                                for file in files:
-
-                                                        metricname = file.split( '.rrd' )[0]
-
-                                                        if not self.lastStored.has_key( host ):
-
-                                                                self.lastStored[ host ] = { }
-
-                                                        self.lastStored[ host ][ metricname ] = self.rrdm.grabLastUpdate( metric_dir + '/' + file )
+                                        dirlist = os.listdir( metric_dir )
+
+                                        for file in dirlist:
+
+                                                metricname = file.split( '.rrd' )[0]
+
+                                                if not self.lastStored.has_key( host ):
+
+                                                        self.lastStored[ host ] = { }
+
+                                                self.lastStored[ host ][ metricname ] = self.rrdm.grabLastUpdate( metric_dir + '/' + file )
 
         def getClusterName( self ):
@@ -672 +690 @@
                 if os.path.exists( rrd_dir ):
 
-                        for root, dirs, files in os.walk( rrd_dir ):
-
-                                for dir in dirs:
-
-                                        valid_dir = 1
-
-                                        for letter in dir:
-                                                if letter not in string.digits:
-                                                        valid_dir = 0
-
-                                        if valid_dir:
-                                                timeserial = dir
-                                                if timeserial > newest_timeserial:
-                                                        newest_timeserial = timeserial
+                        dirlist = os.listdir( rrd_dir )
+
+                        for dir in dirlist:
+
+                                valid_dir = 1
+
+                                for letter in dir:
+                                        if letter not in string.digits:
+                                                valid_dir = 0
+
+                                if valid_dir:
+                                        timeserial = dir
+                                        if timeserial > newest_timeserial:
+                                                newest_timeserial = timeserial
 
                 if newest_timeserial: