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

[TABLELOCK] fix several bugs about timeout in tablelock

Browse Source
This commit is contained in:
YangEfei
2024-02-02 18:51:34 +00:00
committed by ob-robot
parent f4ae0ebd1b
commit 89f74f205e
18 changed files with 221 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/rootserver/ob_ddl_service.cpp
View File

@ -6098,7 +6098,6 @@ int ObDDLService::lock_tablets(ObMySQLTransaction &trans,
timeout,
conn))) {
LOG_WARN("lock dest table failed", KR(ret), K(table_id), K(tenant_id));
ret = ObDDLUtil::is_table_lock_retry_ret_code(ret) ? OB_EAGAIN : ret;
}
}
}
@ -6132,7 +6131,6 @@ int ObDDLService::lock_table(ObMySQLTransaction &trans,
timeout,
conn))) {
LOG_WARN("lock dest table failed", KR(ret), K(table_schema));
ret = ObDDLUtil::is_table_lock_retry_ret_code(ret) ? OB_EAGAIN : ret;
}
}
return ret;
@ -6169,7 +6167,6 @@ int ObDDLService::lock_mview(ObMySQLTransaction &trans, const ObSimpleTableSchem
lock_arg.timeout_us_ = 0;
if (OB_FAIL(ObInnerConnectionLockUtil::lock_obj(tenant_id, lock_arg, conn))) {
LOG_WARN("fail to lock mview obj", KR(ret), K(tenant_id), K(lock_arg), KPC(conn));
ret = ObDDLUtil::is_table_lock_retry_ret_code(ret) ? OB_EAGAIN : ret;
}
}
return ret;