Revert "fix: fix exit core (#3050)" (#3052)

This reverts commit 5c2ecdb.

Author: Mixficsol

conf/pika.conf

@@ -45,9 +45,9 @@ admin-thread-pool-size : 2
 slow-cmd-list :
 
 # List of commands considered as administrative. These commands will be handled by the admin thread pool. Modify this list as needed.
-# Default commands: info, ping, monitor, auth
+# Default commands: info, ping, monitor
 # This parameter is only supported by the CONFIG GET command and not by CONFIG SET.
-admin-cmd-list : info, ping, monitor, auth
+admin-cmd-list : info, ping, monitor
 
 # The number of threads to write DB in slaveNode when replicating.
 # It's preferable to set slave's sync-thread-num value close to master's thread-pool-size.

include/pika_cmd_table_manager.h

@@ -73,6 +73,7 @@ class PikaCmdTableManager {
   */
   std::unordered_map<std::string, CommandStatistics> cmdstat_map_;
   std::unordered_map<std::string, CommandStatistics> slow_command_count_;
+  std::thread reset_thread_;
   std::mutex command_mutex_;
   std::shared_mutex histograms_mutex_;
   std::shared_mutex slow_command_mutex_;

include/pika_server.h

@@ -259,7 +259,6 @@ class PikaServer : public pstd::noncopyable {
   void ResetStat();
   void incr_accumulative_connections();
   void ResetLastSecQuerynum();
-  void ResetCommandCount();
   void UpdateQueryNumAndExecCountDB(const std::string& db_name, const std::string& command, bool is_write);
   std::unordered_map<std::string, uint64_t> ServerExecCountDB();
   std::unordered_map<std::string, QpsStatistic> ServerAllDBStat();

src/pika_cmd_table_manager.cc

@@ -15,9 +15,14 @@
 extern std::unique_ptr<PikaConf> g_pika_conf;
 
 void PikaCmdTableManager::ResetCommandCount() {
-  std::lock_guard<std::mutex> lock(command_mutex_);
-  slow_command_count_.clear();
-  InitHistograms(); 
+  while (true) {
+    std::this_thread::sleep_for(std::chrono::minutes(1)); 
+    {
+      std::lock_guard<std::mutex> lock(command_mutex_);
+      slow_command_count_.clear();
+      InitHistograms(); 
+    }
+  }
 }
 
 void PikaCmdTableManager::InitHistograms() {
@@ -33,6 +38,7 @@ PikaCmdTableManager::PikaCmdTableManager() {
   cmds_ = std::make_unique<CmdTable>();
   cmds_->reserve(300);
   InitHistograms();
+  reset_thread_ = std::thread(&PikaCmdTableManager::ResetCommandCount, this);
 }
 
 void PikaCmdTableManager::InitCmdTable(void) {

src/pika_server.cc

@@ -1033,16 +1033,6 @@ void PikaServer::ResetLastSecQuerynum() {
   statistic_.ResetDBLastSecQuerynum();
 }
 
-void PikaServer::ResetCommandCount() {
-  thread_local uint64_t last_reset_time = 0;
-  auto current_time = pstd::NowMicros();
-  if (current_time - last_reset_time < 60 * 1000 * 1000) {
-    return;
-  }
-  last_reset_time = current_time; 
-  g_pika_cmd_table_manager->ResetCommandCount();
-}
-
 void PikaServer::UpdateQueryNumAndExecCountDB(const std::string& db_name, const std::string& command, bool is_write) {
   std::string cmd(command);
   statistic_.server_stat.qps.querynum++;
@@ -1149,8 +1139,6 @@ void PikaServer::DoTimingTask() {
   ResetLastSecQuerynum();
   // Auto update network instantaneous metric
   AutoUpdateNetworkMetric();
-  // Reset command statistics
-  ResetCommandCount();
   ProcessCronTask();
   UpdateCacheInfo();
   // Print the queue status periodically