Changeset 3357

Timestamp:

02/14/10 13:31:14 (2 years ago)

Author:

steve.schnepp

Message:

- adds a aligned suboption to update_rate. Enables to "align

Files:

• people/snide/pre_1.5/master/lib/Munin/Master/UpdateWorker.pm (modified) (4 diffs)

people/snide/pre_1.5/master/lib/Munin/Master/UpdateWorker.pm

@@ -87 +87 @@
-                my %service_data = $self->handle_dirty_config(\%service_config);
-
+                # Check if this plugin has to be updated
+                my $update_rate = get_global_service_value(\%service_config, $plugin, "update_rate", 0); 
+                my ($update_rate_in_seconds, $is_update_discrete) = parse_update_rate($update_rate);
+                # 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;
+                }
+
-                if (! %service_data) {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                        }
-
-                        %service_data = $self->{node}->fetch_service_data($plugin);
-                }
-
@@ -211 +225 @@
-}
-
+sub parse_update_rate {
+        my ($update_rate_config) = @_;
+        #$update_rate_config = $config->_trim($update_rate_config);
+
+        my ($is_update_discrete, $update_rate_in_sec);
+        if ($update_rate_config =~ m/(\d+[a-z]?) (discrete)?/) {
+                $update_rate_in_sec = to_sec($1);
+                $is_update_discrete = $2;
+        } else {
+                return (0, 0);
+        }
+
+        return ($update_rate_in_sec, $is_update_discrete);
+}
+
+sub round_to_granularity {
+        my ($when, $granularity_in_sec) = @_;
+        $when = time if ($when eq "N"); # N means "now"
+
+        my $rounded_when = $when - ($when % $granularity_in_sec);
+        return $rounded_when;
+}
+
-sub handle_dirty_config {
-        my ($self, $service_config) = @_;
@@ -228 +265 @@
-                        $service_data{$service}->{$field} = {
-                                "value" => $field_value,
- # This may be the perfect candidate for "update_rate NNN/discrete"
+
-                        };
-                }
@@ -618 +655 @@
-        if ($target =~ m/(\d+)([smhdwty])/i) {
-                return $1 * $secs_table->{$2};  
+        } else {
+                # no recognised unit, return the int value as seconds
+                return int $target;
-        }
-}