fix data race error

src/cluster/replication.cc

@@ -106,7 +106,7 @@ void FeedSlaveThread::loop() {
  // first batch here to work around this issue instead of waiting for enough batch size.
  bool is_first_repl_batch = true;
  uint32_t yield_microseconds = 2 * 1000;
- std::string &batches_bulk = conn_->GetOutputBuffer();
+ std::string &batches_bulk = conn_->GetSlaveOutputBuffer();
  batches_bulk.clear();
  size_t updates_in_batches = 0;
  while (!IsStopped()) {

src/server/redis_connection.cc

@@ -52,6 +52,7 @@ Connection::Connection(bufferevent *bev, Worker *owner)
  create_time_ = now;
  last_interaction_ = now;
  output_buffer_.clear();
+ slave_output_buffer_.clear();
 }
 
 Connection::~Connection() {
@@ -369,9 +370,9 @@ static bool IsCmdForIndexing(const CommandAttributes *attr) {
 }
 
 void Connection::ExecuteCommands(std::deque<CommandTokens> *to_process_cmds) {
- output_buffer_.clear();
+ GetOutputBuffer().clear();
  const Config *config = srv_->GetConfig();
- std::string &reply = output_buffer_;
+ std::string &reply = GetOutputBuffer();
  std::string password = config->requirepass;
 
  while (!to_process_cmds->empty()) {
@@ -571,6 +572,7 @@ size_t Connection::GetConnectionMemoryUsed() const {
  total_memory += addr_.capacity();
  total_memory += last_cmd_.capacity();
  total_memory += output_buffer_.capacity();
+ total_memory += slave_output_buffer_.capacity();
  total_memory += evbuffer_get_length(Output()) + evbuffer_get_length(Input());
 
  for (const auto &channel : subscribe_channels_) {

src/server/redis_connection.h

@@ -183,6 +183,7 @@ class Connection : public EvbufCallbackBase<Connection> {
  std::atomic<bool> watched_keys_modified = false;
 
  inline std::string &GetOutputBuffer() { return output_buffer_; }
+ inline std::string &GetSlaveOutputBuffer() { return slave_output_buffer_; }
  size_t GetConnectionMemoryUsed() const;
 
  private:
@@ -219,6 +220,7 @@ class Connection : public EvbufCallbackBase<Connection> {
  bool importing_ = false;
  RESP protocol_version_ = RESP::v2;
  std::string output_buffer_;
+ std::string slave_output_buffer_;
 };
 
 } // namespace redis