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

[DeadLock] unregister detector if tx implicit aborted in first write sql

Browse Source
This commit is contained in:
obdev
2023-02-24 14:10:44 +00:00
committed by ob-robot
parent b6a4cddede
commit a781dd3676
5 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/share/deadlock/ob_deadlock_detector_rpc.h
View File

@ -33,13 +33,13 @@ class ObDetectorRpcProxy : public ObRpcProxy
{
public:
DEFINE_TO(ObDetectorRpcProxy);
RPC_AP(PR5 post_lcl_message,
RPC_AP(PR9 post_lcl_message,
OB_DETECTOR_LCL_MESSAGE,
(share::detector::ObLCLMessage), Int64);
RPC_AP(PR5 post_collect_info_message,
RPC_AP(PR9 post_collect_info_message,
OB_DETECTOR_COLLECT_INFO_MESSAGE,
(share::detector::ObDeadLockCollectInfoMessage), Int64);
RPC_AP(PR5 post_notify_parent_message,
RPC_AP(PR9 post_notify_parent_message,
OB_DETECTOR_NOTIFY_PARENT_MESSAGE,
(share::detector::ObDeadLockNotifyParentMessage), Int64)
};

1
src/share/deadlock/ob_lcl_scheme/ob_lcl_node.cpp
View File

@ -519,7 +519,6 @@ int ObLCLNode::process_lcl_message(const ObLCLMessage &lcl_msg)
int64_t diff = current_ts - lcl_msg.get_send_ts();
if (diff > PHASE_TIME / 3) {
DETECT_LOG_(WARN, "phase not match", K(diff), K(current_ts), K(*this));
ret = OB_ERR_UNEXPECTED;
}
} else {
{