From 8ff0f4f3e9e7e7ea813267ab6cc3c67ce866d7f6 Mon Sep 17 00:00:00 2001
From: IHEII <602280108@qq.com>
Date: Wed, 18 Oct 2023 06:39:23 +0000
Subject: [PATCH] [CP] [Fix] OBKV TTL response

---
 src/share/ob_rpc_struct.cpp     | 2 +-
 src/share/table/ob_ttl_util.cpp | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/share/ob_rpc_struct.cpp b/src/share/ob_rpc_struct.cpp
index d5017ae723..ade81b0230 100755
--- a/src/share/ob_rpc_struct.cpp
+++ b/src/share/ob_rpc_struct.cpp
@@ -9420,7 +9420,7 @@ int ObBroadcastConsensusVersionArg::assign(const ObBroadcastConsensusVersionArg
   }
   return ret;
 }
-OB_SERIALIZE_MEMBER(ObTTLResponseArg, tenant_id_, task_id_, server_addr_, task_status_);
+OB_SERIALIZE_MEMBER(ObTTLResponseArg, tenant_id_, task_id_, server_addr_, task_status_, err_code_);
 ObTTLResponseArg::ObTTLResponseArg()
     : tenant_id_(0),
       task_id_(OB_INVALID_ID),
diff --git a/src/share/table/ob_ttl_util.cpp b/src/share/table/ob_ttl_util.cpp
index 2d621cd91b..a53c7aa2ac 100644
--- a/src/share/table/ob_ttl_util.cpp
+++ b/src/share/table/ob_ttl_util.cpp
@@ -274,6 +274,9 @@ int ObTTLUtil::update_ttl_task(uint64_t tenant_id,
   if (OB_FAIL(ret)) {
   } else if (OB_FAIL(proxy.write(gen_meta_tenant_id(tenant_id), sql.ptr(), affect_rows))) {
     LOG_WARN("fail to execute sql", K(ret), K(sql));
+    if (ret == OB_ERR_EXCLUSIVE_LOCK_CONFLICT) {
+      FLOG_INFO("fail to execute sql, this task/rowkey is locked by other thread, pls try again", K(ret), K(sql));
+    }
   } else if (affect_rows != 1) {
     ret = OB_ERR_UNEXPECTED;
     LOG_INFO("execute sql, affect rows != 1", K(ret), K(sql));