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

BUGFIX: fix hold key of lock wait node

Browse Source
This commit is contained in:
obdev 2023-01-09 08:43:44 +00:00 committed by ob-robot
parent 45ec90fae4
commit 322032b9ca
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/oblib/src/rpc/ob_lock_wait_node.h vendored
View File

@ -63,8 +63,10 @@ struct ObLockWaitNode: public common::SpHashNode
KP_(addr),
K_(hash),
K_(lock_ts),
K_(lock_seq),
K_(abs_timeout),
K_(tablet_id),
K_(try_lock_times),
KCSTRING_(key),
K_(sessid),
K_(block_sessid),

8
src/storage/memtable/ob_lock_wait_mgr.cpp
View File

@ -456,7 +456,7 @@ ObLink* ObLockWaitMgr::check_timeout()
node2del = iter;
need_check_session = true;
iter->on_retry_lock(hash);
TRANS_LOG(INFO, "standalone task should be waken up", K(*iter));
TRANS_LOG(INFO, "standalone task should be waken up", K(*iter), K(curr_lock_seq));
} else if (iter->get_run_ts() > 0 && ObTimeUtility::current_time() > iter->get_run_ts()) {
node2del = iter;
need_check_session = true;
@ -564,9 +564,6 @@ int ObLockWaitMgr::post_lock(const int tmp_ret,
if (OB_NOT_NULL(node = get_thread_node())) {
Key key(&row_key);
uint64_t &hold_key = get_thread_hold_key();
if (hold_key == hash_rowkey(tablet_id, key)) {
hold_key = 0;
}
if (OB_TRY_LOCK_ROW_CONFLICT == tmp_ret) {
auto row_hash = hash_rowkey(tablet_id, key);
auto tx_hash = hash_trans(holder_tx_id);
@ -577,6 +574,9 @@ int ObLockWaitMgr::post_lock(const int tmp_ret,
TRANS_LOG(WARN, "recheck lock fail", K(key), K(holder_tx_id));
} else if (locked) {
auto hash = wait_on_row ? row_hash : tx_hash;
if (hold_key == hash) {
hold_key = 0;
}
if (is_remote_sql) {
delay_header_node_run_ts(hash);
}