Revert "braft Performance optimization"

This reverts commit 7ad42a2.

Author: wuxianrong

conf/pika.conf

@@ -656,35 +656,11 @@ raft-peers :
 # Raft election timeout in milliseconds
 # This is the time to wait before starting a new election if no heartbeat is received
 # A larger value reduces the chance of unnecessary elections but increases failover time
-# Optimized default: 300ms (for faster failover, was 1000ms)
-# Range: 100-5000ms, Recommended: 300-500ms for LAN
-raft-election-timeout-ms : 300
+# Default value is 1000ms (1 second)
+raft-election-timeout-ms : 1000
 
 # Raft snapshot interval in seconds
 # This determines how often Raft takes snapshots of the state machine
 # Snapshots are used to compact the log and speed up node recovery
 # Default value is 3600 seconds (1 hour)
 raft-snapshot-interval-s : 3600
-
-## Raft Performance Tuning (批处理性能优化)
-
-# Enable request batching for better throughput
-# When enabled, multiple client requests are batched into a single Raft log entry
-# This significantly reduces Raft consensus overhead
-# Default: yes (enabled for optimal performance)
-raft-enable-batching : yes
-
-# Batch timeout in milliseconds
-# How long to wait before flushing a batch (if max-batch-size not reached)
-# Lower values = lower latency but less batching benefit
-# Higher values = more batching but higher P99 latency
-# Range: 1-10ms, Recommended: 2-5ms
-# Default: 2ms
-raft-batch-timeout-ms : 2
-
-# Maximum number of requests in a single batch
-# When this limit is reached, the batch is flushed immediately
-# Higher values = more batching but higher memory usage
-# Range: 100-10000, Recommended: 500-2000
-# Default: 1000
-raft-max-batch-size : 1000

include/pika_conf.h

@@ -906,20 +906,6 @@ class PikaConf : public pstd::BaseConf {
     return raft_snapshot_interval_s_;
   }
 
-  // Raft 性能优化相关配置
-  bool raft_enable_batching() {
-    std::shared_lock l(rwlock_);
-    return raft_enable_batching_;
-  }
-  int raft_batch_timeout_ms() {
-    std::shared_lock l(rwlock_);
-    return raft_batch_timeout_ms_;
-  }
-  int raft_max_batch_size() {
-    std::shared_lock l(rwlock_);
-    return raft_max_batch_size_;
-  }
-  
   int Load();
   int ConfigRewrite();
   int ConfigRewriteSlaveOf();
@@ -1107,13 +1093,8 @@ class PikaConf : public pstd::BaseConf {
   bool raft_enabled_ = false;
   std::string raft_group_id_;
   std::string raft_peers_;
-  int raft_election_timeout_ms_ = 300;  // 优化后的默认值：300ms
+  int raft_election_timeout_ms_ = 1000;
   int raft_snapshot_interval_s_ = 3600;
-  
-  // Raft 性能优化配置
-  bool raft_enable_batching_ = true;    // 启用批处理（默认开启）
-  int raft_batch_timeout_ms_ = 2;       // 批处理超时：2ms
-  int raft_max_batch_size_ = 1000;      // 最大批量大小：1000
 };
 
 #endif

src/pika_conf.cc

@@ -717,26 +717,13 @@ int PikaConf::Load() {
 
   GetConfInt("raft-election-timeout-ms", &raft_election_timeout_ms_);
   if (raft_election_timeout_ms_ <= 0) {
-    raft_election_timeout_ms_ = 300;  // 优化后的默认值
+    raft_election_timeout_ms_ = 1000;
   }
 
   GetConfInt("raft-snapshot-interval-s", &raft_snapshot_interval_s_);
   if (raft_snapshot_interval_s_ <= 0) {
     raft_snapshot_interval_s_ = 3600;
   }
-  
-  // Raft 性能优化配置
-  GetConfBool("raft-enable-batching", &raft_enable_batching_);
-  
-  GetConfInt("raft-batch-timeout-ms", &raft_batch_timeout_ms_);
-  if (raft_batch_timeout_ms_ <= 0) {
-    raft_batch_timeout_ms_ = 2;  // 默认 2ms
-  }
-  
-  GetConfInt("raft-max-batch-size", &raft_max_batch_size_);
-  if (raft_max_batch_size_ <= 0) {
-    raft_max_batch_size_ = 1000;  // 默认 1000
-  }
 
   return ret;
 }

src/praft/CMakeLists.txt

@@ -21,11 +21,6 @@ add_dependencies(binlog_pb protobuf)
 # Collect all source files (excluding binlog.proto which is in binlog_pb)
 aux_source_directory(./src DIR_SRCS)
 
-# Add batch_manager source files explicitly
-set(DIR_SRCS ${DIR_SRCS} 
-    ${CMAKE_CURRENT_SOURCE_DIR}/batch_manager.cc
-)
-
 # Create static library (WITHOUT binlog protobuf sources, link binlog_pb instead)
 add_library(praft STATIC ${DIR_SRCS})