Changeset 3869

Timestamp:

08/19/10 12:14:20 (1 year ago)

Author:

janl

Message:

* munin-node: Insert a reset_timeout() call to enable the master to get in a word in edgeways after a slow plugin has executed

Files:

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

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

@@ -147 +147 @@
-    # catch and report any system errors in a clean way.
-    eval {
-        # BUG: It appears that the plugin timeout is still in place
-        # when _net_read is executing.  Meaning that if the previous
-        # plugin takes close to $timeout time then there is very very
-        # short time for munin-update to issue a new command.
-        # 
-
-        $timed_out = !do_with_timeout($services->{timeout}, sub {
-            while (defined ($line = _net_read($session))) {
@@ -160 +154 @@
-                    last;
-                }
+                # Reset timeout to wait a reasonable time for input
+                # from the master.
+                # Misfeature: Plugin timeout and input timeout are identical
+                reset_timeout();
-                $line = "<waiting for input from master, previous was '$line'>";
-            }