fix rollback fail bug

a0978c20 · zh0 · wangzelin.wzl · 53b1e663 · a0978c20
隐藏空白更改
内联并排

Showing with 3 addition and 0 deletion

src/storage/transaction/ob_trans_service.cpp src/storage/transaction/ob_trans_service.cpp +3 -0

未找到文件。
--- 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)))) {