1) bugfix for pink; 2) check 'ulimit -n' at startup 3) do not remove …

…master when master reply already_exist
damon008 · Jun 29, 2016 · 4ec72d1 · 4ec72d1
1 parent e8ce0da
commit 4ec72d1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/include/pika_define.h b/include/pika_define.h
@@ -35,6 +35,8 @@ struct SlaveItem {
   struct timeval create_time;
 };
 
+#define PIKA_MIN_RESERVED_FDS 5000
+
 #define SLAVE_ITEM_STAGE_ONE 1
 #define SLAVE_ITEM_STAGE_TWO 2
 

diff --git a/src/pika.cc b/src/pika.cc
@@ -1,4 +1,5 @@
 #include <glog/logging.h>
+#include <sys/resource.h>
 #include "pika_server.h"
 #include "pika_command.h"
 #include "pika_conf.h"
@@ -132,6 +133,21 @@ int main(int argc, char *argv[]) {
 
   PikaConfInit(path);
 
+  rlimit limit;
+  if (getrlimit(RLIMIT_NOFILE,&limit) == -1) {
+    LOG(WARNING) << "getrlimit error: " << strerror(errno);
+  } else if (limit.rlim_cur < g_pika_conf->maxclients() + PIKA_MIN_RESERVED_FDS) {
+    rlim_t old_limit = limit.rlim_cur;
+    rlim_t best_limit = g_pika_conf->maxclients() + PIKA_MIN_RESERVED_FDS;
+    limit.rlim_cur = best_limit > limit.rlim_max ? limit.rlim_max-1 : best_limit;
+    limit.rlim_max = best_limit > limit.rlim_max ? limit.rlim_max-1 : best_limit;
+    if (setrlimit(RLIMIT_NOFILE,&limit) != -1) {
+      LOG(WARNING) << "your 'limit -n ' of " << old_limit << " is not enough for Redis to start. pika have successfully reconfig it to " << limit.rlim_cur;
+    } else {
+      LOG(FATAL) << "your 'limit -n ' of " << old_limit << " is not enough for Redis to start. pika can not reconfig it(" << strerror(errno) << "), do it by yourself";
+    }
+  }
+
   // daemonize if needed
   if (g_pika_conf->daemonize()) {
     daemonize();

diff --git a/src/pika_trysync_thread.cc b/src/pika_trysync_thread.cc
@@ -93,9 +93,9 @@ bool PikaTrysyncThread::RecvProc() {
         // 3, Master do dbsyncing
         LOG(INFO) << "Need wait to sync";
         g_pika_server->NeedWaitDBSync();
-      } else {
-        LOG(WARNING) << "remove master";
-        g_pika_server->RemoveMaster();
+//      } else {
+//        LOG(WARNING) << "remove master";
+//        g_pika_server->RemoveMaster();
       }
       return false;
     }