Merge pull request #1959 from dorothy00dd2/fix-redis

fix arena cleared early when parse redis message
apache · Oct 24, 2022 · 5d89893 · 5d89893
2 parents 329c626 + 03ad6bc
commit 5d89893
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/src/brpc/policy/redis_protocol.cpp b/src/brpc/policy/redis_protocol.cpp
@@ -190,7 +190,9 @@ ParseResult ParseRedisMessage(butil::IOBuf* source, Socket* socket,
         wopt.ignore_eovercrowded = true;
         LOG_IF(WARNING, socket->Write(&sendbuf, &wopt) != 0)
             << "Fail to send redis reply";
-        ctx->arena.clear();
+        if(ctx->parser.ParsedArgsSize() == 0) {
+            ctx->arena.clear();
+        }
         return MakeParseError(err);
     } else {
         // NOTE(gejun): PopPipelinedInfo() is actually more contended than what

diff --git a/src/brpc/redis_command.cpp b/src/brpc/redis_command.cpp
@@ -361,6 +361,10 @@ RedisCommandParser::RedisCommandParser()
     , _length(0)
     , _index(0) {}
 
+size_t RedisCommandParser::ParsedArgsSize() {
+    return _args.size();
+}
+
 ParseError RedisCommandParser::Consume(butil::IOBuf& buf,
                                        std::vector<butil::StringPiece>* args,
                                        butil::Arena* arena) {

diff --git a/src/brpc/redis_command.h b/src/brpc/redis_command.h
@@ -53,6 +53,7 @@ class RedisCommandParser {
     // in `arena'.
     ParseError Consume(butil::IOBuf& buf, std::vector<butil::StringPiece>* args,
                        butil::Arena* arena);
+    size_t ParsedArgsSize();
 
 private:
     // Reset parser to the initial state.