[svn-commits] wdoekes: trunk r424881 - in /trunk: ./ contrib/scripts/safe_asterisk

[SVN commits to the Digium repositories]

Author: wdoekes
Date: Thu Oct  9 03:10:35 2014
New Revision: 424881

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=424881
Log:
safe_asterisk: Don't automatically exceed MAXFILES value of 2^20.

On systems with lots of RAM (e.g. 24GB) /proc/sys/fs/file-max divided
by two can exceed the per-process file limit of 2^20. This patch
ensures the value is capped.

(Patch cleaned up by me.)

ASTERISK-24011 #close
Reported by: Michael Myles
Patches:
  safe_asterisk-ulimit.diff uploaded by Michael Myles (License #6626)
........

Merged revisions 424875 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 424878 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 424879 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 424880 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/contrib/scripts/safe_asterisk

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/contrib/scripts/safe_asterisk
URL: http://svnview.digium.com/svn/asterisk/trunk/contrib/scripts/safe_asterisk?view=diff&rev=424881&r1=424880&r2=424881
==============================================================================
--- trunk/contrib/scripts/safe_asterisk (original)
+++ trunk/contrib/scripts/safe_asterisk Thu Oct  9 03:10:35 2014
@@ -67,12 +67,17 @@
 	message "safe_asterisk was started by `id -n` (uid `id -u`)."
 else
 	if `uname -s | grep Linux >/dev/null 2>&1`; then
-		# maximum number of open files is set to the system maximum divided by two if
-		# MAXFILES is not set.
+		# maximum number of open files is set to the system maximum
+		# divided by two if MAXFILES is not set.
 		if test -z "$MAXFILES"; then
 			# just check if file-max is readable
 			if test -r /proc/sys/fs/file-max; then
-				MAXFILES=$(( `cat /proc/sys/fs/file-max` / 2 ))
+				MAXFILES=$((`cat /proc/sys/fs/file-max` / 2))
+				# don't exceed upper limit of 2^20 for open
+				# files on systems where file-max is > 2^21
+				if test $MAXFILES -gt 1048576; then
+					MAXFILES=1048576
+				fi
 			fi
 		fi
 		SYSCTL_MAXFILES="fs.file-max"