From: antirez <antirez@gmail.com>
Date: Tue, 3 Apr 2012 09:53:45 +0000 (+0200)
Subject: When the user-provided 'maxclients' value is too big for the max number of files... 
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/fbce475270e948c34c6e8e8fb15ac6cb74c41de6

When the user-provided 'maxclients' value is too big for the max number of files we can open, at least try to search the max the OS is allowing (in steps of 256 filedes).
---

diff --git a/src/redis.c b/src/redis.c
index 557b361a..0bff9339 100644
--- a/src/redis.c
+++ b/src/redis.c
@@ -1124,10 +1124,18 @@ void adjustOpenFilesLimit(void) {
         /* Set the max number of files if the current limit is not enough
          * for our needs. */
         if (oldlimit < maxfiles) {
-            limit.rlim_cur = maxfiles;
-            limit.rlim_max = maxfiles;
-            if (setrlimit(RLIMIT_NOFILE,&limit) == -1) {
-                server.maxclients = oldlimit-32;
+            rlim_t f;
+            
+            f = maxfiles;
+            while(f > oldlimit) {
+                limit.rlim_cur = f;
+                limit.rlim_max = f;
+                if (setrlimit(RLIMIT_NOFILE,&limit) != -1) break;
+                f -= 128;
+            }
+            if (f < oldlimit) f = oldlimit;
+            if (f != maxfiles) {
+                server.maxclients = f-32;
                 redisLog(REDIS_WARNING,"Unable to set the max number of files limit to %d (%s), setting the max clients configuration to %d.",
                     (int) maxfiles, strerror(errno), (int) server.maxclients);
             } else {