Changeset 3840

Timestamp:

28/07/10 14:38:00 (2 years ago)

Author:

ligne

Message:

keep a track of when each poller was last restarted, and give up on them if it was too recent (currently <10s). should prevent a critically broken service from crashing over and over again.

maybe 10s should really be $service_interval...

Files:

• trunk/node/lib/Munin/Node/ProxySpooler.pm (modified) (2 diffs)

trunk/node/lib/Munin/Node/ProxySpooler.pm

@@ -50 +50 @@
-
-    my $self = __PACKAGE__->new(%args);
+
+    my %poller_restarted;  # when each service's poller was last restarted
-
-    # Daemonzises, and runs for cover.
@@ -93 +95 @@
-        logger("Poller $deceased ($service) exited with $exit/$signal");
-
+        # avoid restarting the poller if it was last restarted too recently.
+        if (time - ($poller_restarted{$service} || 0) < 10) {
+            logger("Poller for '$service' last restarted at $poller_restarted{$service}.  Giving up.");
+            next;
+        }
+
-        # Respawn the poller
-        logger("Respawning poller for '$service'");
-        my $new_pid = $self->_launch_single_poller($service, $intervals->{$service});
-        $pollers->{$new_pid} = $service;
+        $poller_restarted{$service} = time;
-    }
-