From a0978c20a8dd3ef25dbf0508474ec74927eb035e Mon Sep 17 00:00:00 2001
From: zh0 <zh0@oceanbase.com>
Date: Tue, 27 Jul 2021 11:27:14 +0800
Subject: [PATCH] fix rollback fail bug

---
 src/storage/transaction/ob_trans_service.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/storage/transaction/ob_trans_service.cpp b/src/storage/transaction/ob_trans_service.cpp
index c41d92c24..01efb8fa7 100644
--- a/src/storage/transaction/ob_trans_service.cpp
+++ b/src/storage/transaction/ob_trans_service.cpp
@@ -1059,6 +1059,9 @@ int ObTransService::end_trans(
     if (is_rollback && OB_TRANS_TIMEOUT == ret) {
       if (OB_UNLIKELY(OB_SUCCESS != (tmp_ret = end_trans_callback_(cb, OB_SUCCESS, tenant_id)))) {
         ret = tmp_ret;
+      } else {
+        // overwrite retcode when rollback timeout
+        ret = OB_SUCCESS;
       }
     } else {
       if (OB_UNLIKELY(OB_SUCCESS != (tmp_ret = end_trans_callback_(cb, ret, tenant_id)))) {