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

priority return ob_trans_timeout to ob_trans_killed after tx timeout and abort itself during stmt execute

Browse Source
This commit is contained in:
felix-w15
2023-12-14 12:13:54 +00:00
committed by ob-robot
parent d550c19b43
commit 81378da186
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/storage/tx/ob_trans_part_ctx.cpp
View File

@ -7450,8 +7450,13 @@ int ObPartTransCtx::check_status_()
}
TRANS_LOG(WARN, "tx has decided", K(ret), KPC(this));
} else if (OB_UNLIKELY(sub_state_.is_force_abort())) {
ret = OB_TRANS_KILLED;
TRANS_LOG(WARN, "tx force aborted due to data incomplete", K(ret), KPC(this));
if (is_trans_expired_()) {
ret = OB_TRANS_TIMEOUT;
TRANS_LOG(WARN, "tx has decided", K(ret), KPC(this));
} else {
ret = OB_TRANS_KILLED;
TRANS_LOG(WARN, "tx force aborted due to data incomplete", K(ret), KPC(this));
}
} else if (OB_UNLIKELY(is_follower_())) {
ret = OB_NOT_MASTER;
} else if (OB_UNLIKELY(is_exiting_)) {