Author: brandonwilliams Date: Fri Sep 23 21:23:37 2011 New Revision: 1175027
URL: http://svn.apache.org/viewvc?rev=1175027&view=rev Log: Increase FD limit to 100k in packaging. Patch by Paul Cannon, reviewed by brandonwilliams for CASSANDRA-3206 Modified: cassandra/branches/cassandra-0.8/CHANGES.txt cassandra/branches/cassandra-0.8/debian/cassandra.conf cassandra/branches/cassandra-0.8/debian/init cassandra/branches/cassandra-0.8/redhat/cassandra.conf Modified: cassandra/branches/cassandra-0.8/CHANGES.txt URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1175027&r1=1175026&r2=1175027&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/CHANGES.txt (original) +++ cassandra/branches/cassandra-0.8/CHANGES.txt Fri Sep 23 21:23:37 2011 @@ -4,6 +4,7 @@ * Log message when a full repair operation completes (CASSANDRA-3207) * Don't allow any cache loading exceptions to halt startup (CASSANDRA-3218) * Fix sstableloader --ignores option (CASSANDRA-3247) + * File descriptor limit increased in packaging (CASSANDRA-3206) 0.8.6 Modified: cassandra/branches/cassandra-0.8/debian/cassandra.conf URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/debian/cassandra.conf?rev=1175027&r1=1175026&r2=1175027&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/debian/cassandra.conf (original) +++ cassandra/branches/cassandra-0.8/debian/cassandra.conf Fri Sep 23 21:23:37 2011 @@ -1,2 +1,3 @@ # Provided by the cassandra package cassandra - memlock unlimited +cassandra - nofile 100000 Modified: cassandra/branches/cassandra-0.8/debian/init URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/debian/init?rev=1175027&r1=1175026&r2=1175027&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/debian/init (original) +++ cassandra/branches/cassandra-0.8/debian/init Fri Sep 23 21:23:37 2011 @@ -22,6 +22,7 @@ CONFDIR=/etc/cassandra JSVC=/usr/bin/jsvc WAIT_FOR_START=10 CASSANDRA_HOME=/usr/share/cassandra +FD_LIMIT=100000 # The first existing directory is used for JAVA_HOME if needed. JVM_SEARCH_DIRS="/usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun" @@ -127,6 +128,7 @@ do_start() is_running && return 1 ulimit -l unlimited + ulimit -n "$FD_LIMIT" cassandra_home=`getent passwd cassandra | awk -F ':' '{ print $6; }'` cd / # jsvc doesn't chdir() for us Modified: cassandra/branches/cassandra-0.8/redhat/cassandra.conf URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/redhat/cassandra.conf?rev=1175027&r1=1175026&r2=1175027&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/redhat/cassandra.conf (original) +++ cassandra/branches/cassandra-0.8/redhat/cassandra.conf Fri Sep 23 21:23:37 2011 @@ -1 +1,2 @@ cassandra - memlock unlimited +cassandra - nofile 100000