hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[CP] fix do not return return code if transaction timeout

Browse Source
This commit is contained in:
oceanoverflow
2023-09-26 12:13:56 +00:00
committed by ob-robot
parent 59f8195f31
commit 56e5fe209a
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/storage/high_availability/ob_transfer_lock_utils.cpp
View File

@ -212,6 +212,7 @@ int ObMemberListLockUtils::unlock_ls_member_list(const uint64_t tenant_id, const
if (OB_TMP_FAIL(trans.end(OB_SUCC(ret)))) { if (OB_TMP_FAIL(trans.end(OB_SUCC(ret)))) {
LOG_WARN("failed to end trans", K(tmp_ret), K(ret)); LOG_WARN("failed to end trans", K(tmp_ret), K(ret));
ret = OB_SUCCESS == ret ? tmp_ret : ret;
} }
} }
} }
@ -494,6 +495,7 @@ int ObMemberListLockUtils::insert_lock_info(const uint64_t tenant_id, const shar
} }
if (OB_TMP_FAIL(trans.end(OB_SUCC(ret)))) { if (OB_TMP_FAIL(trans.end(OB_SUCC(ret)))) {
LOG_WARN("failed to end trans", K(tmp_ret), K(ret)); LOG_WARN("failed to end trans", K(tmp_ret), K(ret));
ret = OB_SUCCESS == ret ? tmp_ret : ret;
} }
} }
return ret; return ret;