Ticket #5: munin-update_rate.diff

master/lib/Munin/Master/UpdateWorker.pm

@@ -78 +78 @@
-                next;
-            }
-
+            # Check if this plugin has to be updated
+            my $update_rate_in_seconds = get_global_service_value(\%service_config, $plugin, "update_rate", 0); # default is 0 sec : always update when asked
+            
+            DEBUG "[DEBUG] update_rate $update_rate_in_seconds for $plugin on $nodedesignation";
+            if ($update_rate_in_seconds && is_fresh_enough($nodedesignation, $plugin, $update_rate_in_seconds)) {
+                # It's fresh enough, skip this $service
+                DEBUG "[DEBUG] $plugin is fresh enough, not updating it";
+                next;   
+        }
+
-            my %service_data = eval {
-                $self->{node}->fetch_service_data($plugin);
-            };
@@ -137 +147 @@
-    }
-}
-
+sub get_global_service_value {
+        my ($service_config, $service, $conf_field_name, $default) = @_;
+        foreach my $array (@{$service_config->{global}{$service}}) {
+                my ($field_name, $field_value) = @$array;
+                if ($field_name eq $conf_field_name) {
+                        return $field_value;
+                }
+        }
-
+        return $default;
+}
+
+sub is_fresh_enough {
+        my ($nodedesignation, $service, $update_rate_in_seconds) = @_;
+
+        my $key = "$nodedesignation/$service";
+        DEBUG "is_fresh_enough asked for $key with a rate of $update_rate_in_seconds";
+
+        my %last_updated;
+        # XXX - ugly hack. Should be refactored to use a a common state provider
+
+        use Fcntl;   # For O_RDWR, O_CREAT, etc.
+        use NDBM_File;
+        tie(%last_updated, 'NDBM_File', '/tmp/munin_plugins_last_updated', O_RDWR|O_CREAT, 0666) or ERROR "$!";
+        DEBUG "last_updated{$key}: " . $last_updated{$key};
+        my @last = split(/ /, $last_updated{$key});
+   
+        use Time::HiRes qw(gettimeofday tv_interval);   
+        my $now = [ gettimeofday ];
+
+        my $age = tv_interval(\@last, $now);    
+        DEBUG "last: " . Dumper(\@last) . ", now: " . Dumper($now) . ", age: $age";
+        my $is_fresh_enough = ($age < $update_rate_in_seconds);
+        DEBUG "is_fresh_enough  $is_fresh_enough";
+
+        if (! $is_fresh_enough) {
+                DEBUG "new value: " . join(" ", @$now);
+                $last_updated{$key} = join(" ", @$now);
+        }
+
+        untie(%last_updated);
+
+        return $is_fresh_enough;
+}
+
+
-sub uw_fetch_service_config {
-    # not sure why fetch_service_config needs eval and fetch_service_data
-    # does not. - janl 2009-10-22