Changeset 42 for trunk

Timestamp:

04/05/05 14:30:58 (18 years ago)

Author:

bastiaans

Message:

daemon/togad.py:

Added functions for gathering all 'last_update' values of existing .rrds

• This is done 1 time, at startup, for each cluster

File:

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

trunk/daemon/togad.py

@@ -75 +75 @@
                 return self.perform( 'update', '"' + filename + '"', args )
 
+        def grabLastUpdate( self, filename ):
+
+                last_update = 0
+
+                for line in os.popen( self.binary + ' info "' + filename + '"' ).readlines():
+
+                        if line.find( 'last_update') != -1:
+
+                                last_update = line.split( ' = ' )[1]
+
+                if last_update:
+                        return last_update
+                else:
+                        return 0
+
         def perform( self, action, filename, args ):
 
@@ -334 +349 @@
                 #
                 #STORE_INTERVAL = random.randint( 60, 180 )
-                STORE_INTERVAL = 40
+                STORE_INTERVAL = 180
 
                 storethread = threading.Thread( None, self.storeThread, 'storemetricthread' )
@@ -478 +493 @@
                 self.slot = threading.Lock()
                 self.rrdm = RRDMutator()
+                self.gatherLastUpdates()
+
+        def gatherLastUpdates( self ):
+                "Populate the lastStored list, containing timestamps of all last updates"
+
+                cluster_dir = '%s/%s' %( check_dir(ARCHIVE_PATH), self.cluster )
+
+                hosts = [ ]
+
+                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 )
+
+                for host in hosts:
+
+                        last_serial = self.getLastRrdTimeSerial( host )
+                        if last_serial:
+
+                                metric_dir = cluster_dir + '/' + host + '/' + last_serial
+                                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 )
 
         def getClusterName( self ):
@@ -525 +584 @@
                         #
                         if len( self.myMetrics[ host ][ metricname ] ) > 0:
-                                metric = self.myMetrics[ host ][ metricname ].pop()
+                                metric = self.myMetrics[ host ][ metricname ].pop( 0 )
 
                         self.slot.release()