Support max clients configuration

Qihoo360 · Aug 21, 2017 · 577c11c · 577c11c
1 parent 9549db6
commit 577c11c
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 10 deletions.
diff --git a/conf/zgw-example.conf b/conf/zgw-example.conf
@@ -8,6 +8,7 @@ server_ip:           0.0.0.0
 server_port:         8099
 admin_port:          8199
 worker_num:          4
+max_clients:         8000
 enable_gc:           no
 
 #yes or no

diff --git a/src/zgw_config.cc b/src/zgw_config.cc
@@ -17,6 +17,7 @@ ZgwConfig::ZgwConfig(std::string path)
         daemonize(false),
         minloglevel(0),
         worker_num(2),
+        max_clients(5000),
         enable_gc(false),
         log_path("./log"),
         pid_file(kZgwPidFile),
@@ -49,6 +50,7 @@ int ZgwConfig::LoadConf() {
   b_conf->GetConfBool("daemonize", &daemonize);
   b_conf->GetConfInt("minloglevel", &minloglevel);
   b_conf->GetConfInt("worker_num", &worker_num);
+  b_conf->GetConfInt("max_clients", &max_clients);
   b_conf->GetConfBool("enable_gc", &enable_gc);
 
   b_conf->GetConfStr("log_path", &log_path);

diff --git a/src/zgw_config.h b/src/zgw_config.h
@@ -15,8 +15,8 @@ struct ZgwConfig {
   slash::BaseConf *b_conf;
 
   std::vector<std::string> zp_meta_ip_ports;
-  std::string zp_table_name;
   std::string redis_ip_port;
+  std::string zp_table_name;
   std::string redis_passwd;
 
   std::string server_ip;
@@ -26,6 +26,7 @@ struct ZgwConfig {
   int minloglevel;
   int cron_interval;
   int worker_num;
+  int max_clients;
   bool enable_gc;
 
   std::string log_path;

diff --git a/src/zgw_server.cc b/src/zgw_server.cc
@@ -18,7 +18,14 @@ static std::string LockName() {
     std::to_string(thread_seq_++);
 }
 
-int ZgwServerHandle::CreateWorkerSpecificData(void** data) const {
+bool ZgwServer::ZgwServerHandle::AccessHandle(std::string& ip) const {
+  if (zgw_server_->zgw_dispatch_thread_->conn_num() > g_zgw_conf->max_clients) {
+    return false;
+  }
+  return true;
+}
+
+int ZgwServer::ZgwServerHandle::CreateWorkerSpecificData(void** data) const {
   zgwstore::ZgwStore* store;
   Status s = zgwstore::ZgwStore::Open(g_zgw_conf->zp_meta_ip_ports,
                                       g_zgw_conf->redis_ip_port,
@@ -35,14 +42,15 @@ int ZgwServerHandle::CreateWorkerSpecificData(void** data) const {
   return 0;
 }
 
-int ZgwServerHandle::DeleteWorkerSpecificData(void* data) const {
+int ZgwServer::ZgwServerHandle::DeleteWorkerSpecificData(void* data) const {
   delete reinterpret_cast<zgwstore::ZgwStore*>(data);
   return 0;
 }
 
 ZgwServer::ZgwServer()
     : should_exit_(false),
-      worker_num_(g_zgw_conf->worker_num) {
+      worker_num_(g_zgw_conf->worker_num),
+      server_handle_(this) {
   if (worker_num_ > kMaxWorkerThread) {
     LOG(WARNING) << "Exceed max worker thread num: " << kMaxWorkerThread;
     worker_num_ = kMaxWorkerThread;

diff --git a/src/zgw_server.h b/src/zgw_server.h
@@ -22,12 +22,6 @@
 
 using slash::Status;
 
-class ZgwServerHandle : public pink::ServerHandle {
- public:
-  virtual int CreateWorkerSpecificData(void** data) const override;
-  virtual int DeleteWorkerSpecificData(void* data) const override;
-};
-
 class ZgwServer {
  public:
   explicit ZgwServer();
@@ -48,6 +42,18 @@ class ZgwServer {
 
   int worker_num_;
 
+  class ZgwServerHandle : public pink::ServerHandle {
+   public:
+    ZgwServerHandle(ZgwServer* server) : zgw_server_(server) {}
+
+    virtual bool AccessHandle(std::string& ip) const override;
+    virtual int CreateWorkerSpecificData(void** data) const override;
+    virtual int DeleteWorkerSpecificData(void* data) const override;
+
+   private:
+    ZgwServer* zgw_server_;
+  };
+
   ZgwServerHandle server_handle_;
   ZgwConnFactory conn_factory_;
   pink::ServerThread* zgw_dispatch_thread_;