* munin-*cgi-graph: User contributed patch to avoid semafore overflow…

…/deadlock in certain error conditions.
munin-monitoring · Dec 23, 2009 · f73bca2 · f73bca2
1 parent d53aa8b
commit f73bca2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/master/_bin/munin-cgi-graph.in b/master/_bin/munin-cgi-graph.in
@@ -25,14 +25,15 @@
 
 use RRDs;
 use Munin::Master::Utils;
+use Munin::Common::Defaults;
 use strict;
 use IO::Handle;
 use Date::Manip;
 use POSIX qw(strftime);
 use IPC::SysV qw(IPC_CREAT);
 
-my $GRAPHER = "@@LIBDIR@@/munin-graph";
-my $conffile = "@@CONFDIR@@/munin.conf";
+my $GRAPHER = "$Munin::Common::Defaults::MUNIN_LIBDIR/munin-graph";
+my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
 
 my %TIMES   = ( "day"   => ["--noweek", "--nomonth", "--noyear", "--nosumweek", "--nosumyear"], 
 		"week"  => ["--noday", "--nomonth", "--noyear", "--nosumweek", "--nosumyear"], 
@@ -140,7 +141,8 @@ sub sem_setup {
 	my $max_cgi_graph_jobs = &munin_get ($config, "max_cgi_graph_jobs" , 6, $dom);
 
 	# And initialize to max_cgi_graph_jobs
-	my $opstring = pack("s!s!s!",0, $max_cgi_graph_jobs,0);
+	# 0x1000 = SEM_UNDO
+	my $opstring = pack("s!s!s!",0, $max_cgi_graph_jobs,0x1000);
 	semop($semid,$opstring) || die "$!";
     }
 }
@@ -305,6 +307,7 @@ sub draw_graph {
     my $IN;
     sem_get();
 
+    # Note: This open is an implicit fork
     if (! open ($IN, "-|")) { 
 	%ENV=();
 	exec @params;

diff --git a/master/_bin/munin-fastcgi-graph.in b/master/_bin/munin-fastcgi-graph.in
@@ -24,15 +24,16 @@
 
 use RRDs;
 use Munin::Master::Utils;
+use Munin::Common::Defaults;
 use strict;
 use IO::Handle;
 use Date::Manip;
 use POSIX qw(strftime);
 use IPC::SysV qw(IPC_CREAT);
 use CGI::Fast;
 
-my $GRAPHER = "@@LIBDIR@@/munin-graph";
-my $conffile = "@@CONFDIR@@/munin.conf";
+my $GRAPHER = "$Munin::Common::Defaults::MUNIN_LIBDIR/munin-graph";
+my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
 
 my %TIMES   = ( "day"   => ["--noweek", "--nomonth", "--noyear", "--nosumweek", "--nosumyear"], 
 		"week"  => ["--noday", "--nomonth", "--noyear", "--nosumweek", "--nosumyear"], 
@@ -142,7 +143,8 @@ sub sem_setup {
 	my $max_cgi_graph_jobs = &munin_get ($config, "max_cgi_graph_jobs" , 6, $dom);
 
 	# And initialize to max_cgi_graph_jobs
-	my $opstring = pack("s!s!s!",0, $max_cgi_graph_jobs,0);
+	# 0x1000 is SEM_UNDO
+	my $opstring = pack("s!s!s!",0, $max_cgi_graph_jobs,0x1000);
 	semop($semid,$opstring) || die "$!";
     }
 }
@@ -311,6 +313,7 @@ sub draw_graph {
     my $IN;
     sem_get();
 
+    # Note: This open is an implicit fork
     if (! open ($IN, "-|")) { 
 	%ENV=(); 
 	exec @params;