Changeset 20 for trunk

Timestamp:

03/23/05 15:40:45 (19 years ago)

Author:

bastiaans

Message:

daemon/togad.py:

Directory listing each host for each metric took _ages_ to do a update run

• Rewrote timestamping style to: <cluster>/<host>/<time>/<metric>

This requires only 1 dirlisting per host, which speeds up the app considerably:

• A update run now takes 7 seconds, in stead of 2 minutes

File:

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

trunk/daemon/togad.py

@@ -105 +105 @@
                         # Determine time here, so all use same time in this run
                         mytime = self.rrd.makeTimeSerial()
-
-                        self.storeMetrics( self.hostName, mytime )
+                        correct_serial = self.rrd.checkNewRrdPeriod( self.hostName, mytime )
+
+                        self.storeMetrics( self.hostName, correct_serial )
 
                 #if name == 'METRIC':
@@ -282 +283 @@
                 return mytime
 
-        def makeRrdPath( self, host, metric, timeserial='notime' ):
-
-                rrd_dir = '%s/%s/%s' %( check_dir(ARCHIVE_PATH), self.cluster, host )
-                rrd_file = '%s/%s.%s.rrd' %( rrd_dir, metric['name'], timeserial )
+        def makeRrdPath( self, host, metric=None, timeserial=None ):
+
+                if not timeserial:      
+                        rrd_dir = '%s/%s/%s' %( check_dir(ARCHIVE_PATH), self.cluster, host )
+                else:
+                        rrd_dir = '%s/%s/%s/%s' %( check_dir(ARCHIVE_PATH), self.cluster, host, timeserial )
+                if metric:
+                        rrd_file = '%s/%s.rrd' %( rrd_dir, metric['name'] )
+                else:
+                        rrd_file = None
 
                 return rrd_dir, rrd_file
 
-        def getLastRrdTimeSerial( self, host, metric ):
-
-                rrd_dir, rrd_file = self.makeRrdPath( host, metric )
+        def getLastRrdTimeSerial( self, host ):
+
+                rrd_dir, rrd_file = self.makeRrdPath( host )
 
                 newest_timeserial = 0
@@ -298 +305 @@
                         for root, dirs, files in os.walk( rrd_dir ):
 
-                                for file in files:
-
-                                        myre = re.match( '(\S+?).(\d+).rrd', file )
-
-                                        if not myre:
-                                                continue
-
-                                        mymetric = myre.group(1)
-
-                                        if mymetric == metric['name']:
-
-                                                timeserial = myre.group(2)
+                                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
@@ -318 +323 @@
                         return 0
 
-        def checkNewRrdPeriod( self, host, metric, current_timeserial ):
-
-                last_timeserial = int( self.getLastRrdTimeSerial( host, metric ) )
-                debug_msg( 8, 'last timeserial on %s of %s is %s' %( metric['name'], host, last_timeserial ) )
+        def checkNewRrdPeriod( self, host, current_timeserial ):
+
+                last_timeserial = int( self.getLastRrdTimeSerial( host ) )
+                debug_msg( 8, 'last timeserial of %s is %s' %( host, last_timeserial ) )
 
                 if not last_timeserial:
@@ -336 +341 @@
                 return serial
 
-        def createCheck( self, host, metric, current_timeserial ):
+        def createCheck( self, host, metric, timeserial ):
                 "Check if an .rrd allready exists for this metric, create if not"
 
-                timeserial = self.checkNewRrdPeriod( host, metric, current_timeserial )
                 debug_msg( 8, 'rrdcreate: using timeserial %s for %s/%s' %( timeserial, host, metric['name'] ) )
 
@@ -366 +370 @@
                         debug_msg( 9, 'created rrd %s' %( str(rrd_file) ) )
 
-        def update( self, host, metric, current_timeserial ):
-
-                timeserial = self.checkNewRrdPeriod( host, metric, current_timeserial )
+        def update( self, host, metric, timeserial ):
+
                 debug_msg( 8, 'rrdupdate: using timeserial %s for %s/%s' %( timeserial, host, metric['name'] ) )